info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Please read - Need help with sticky tag


From: michael
Subject: Re: Please read - Need help with sticky tag
Date: 15 May 2007 02:58:50 -0700
User-agent: G2/1.0

Hello Dennis,

thank you very much for reading and answering as much as for the
advice.
I finally solved the problem.

As I allready thought the same about moving to tortoise I will now do
so.
Even if I appreciate the effort by the WinCVS programmers, it is
definately not intuitive.

Regards,

Michael

Dennis Jones schrieb:
> "michael" <address@hidden> wrote in message
> news:address@hidden
> > Hello,
> >
> > I must confess, I already wrote a message considering the sticky
> > issue.
> > But unfortunately without any answer.
> >
> > I allready read the threads mentioning sticky tag, but all solutions I
> > found where not applicable to my situation. Please read on and if you
> > have any hint, please let me know.
> >
> > I now reconstructed the way I got into that trap.
> >
> > 1. I was working on my own on a branch of my project.
> > 2. Modified a file, but wanted to get back the last revision (from the
> > branch) I commited.
> > 3. Used first Update from the main menu (WinCVS). This does not help.
> > 4. Used Update (sticky) from the graph menu.
> > 5. Modified and wanted to commit then.
> > 6. It says that sticky tag is not a branch.
>
> My guess is that (in step 4 above) you updated based on a revision number (I
> think that's what you end up getting if you do an update using the graphical
> display in WinCVS, but I don't use WinCVS so I can't be certain).  Anyway,
> what you need to do is update using the branch tag instead of a revision
> number, which will give you a sticky tag that is associated with the branch
> you are currently working on (though you do have to know the name of the
> branch):
>
> cvs up -r<branch_tag> <filename>
>
> for example:
>
> cvs up -r MY_BRANCH myfile.cpp
>
> As to how you got yourself into this mess: if I understand you correctly,
> what you wanted to do was get a clean copy of the file you were working on.
> In other words, you wanted to lose any changes you had made and start over.
> To do this, you would need to use the "get a clean copy" flag with the
> update command.  I don't know how you would do that in WinCVS, but from the
> command line, it is simple:
>
> cvs up -C myfile.cpp
>
> This will give you the latest revision of myfile.cpp on the current branch
> based on the file's sticky tag.  This is essentially the same as deleting
> the file and then doing an update (except it is done in one step and your
> modified file is kept around as a backup in case you need it).
>
> If you don't mind a piece of advice -- get rid of WinCVS and switch to
> either TortoiseCVS or just use the command line CVS tool.  My experience
> with WinCVS was not a pleasant one, and everybody I know that has used it
> has had various problems with it.  Personally, I use command line CVS most
> of the time, but I sometimes use TortoiseCVS which I like because it
> integrates nicely into Explorer and makes using graphic diff'ing tools very
> easy.
>
> - Dennis



reply via email to

[Prev in Thread] Current Thread [Next in Thread]