[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merging the same version again and again and again and again and ...
From: |
Harald Dunkel |
Subject: |
Re: merging the same version again and again and again and again and ... |
Date: |
Tue, 11 Apr 2006 17:02:16 +0200 |
User-agent: |
Mail/News 1.5 (X11/20060325) |
Hi Jim,
Jim Hyslop wrote:
>
> CVS assumes nothing. You *told* it to merge the same file again and
> again. You may only omit the second -j option on the first merge. The
> second and subsequent merges must provide both -j options.
>
Sorry, I missed to mention that I have this problem only for a
few files. All files in my directory had been merged between
2 branches (!= HEAD) several times. Most files are silently
skipped on the second merge. Only a few files became "dirty"
somehow.
> By the way, the better list for this type of question is
> info-cvs@nongnu.org.
>
Sorry, I did not knew this mailing list. But isn't this
unpredictable behavior a bug, anyway?
Regards
Harri
- merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/11
- Re: merging the same version again and again and again and again and ..., Jim Hyslop, 2006/04/11
- Re: merging the same version again and again and again and again and ...,
Harald Dunkel <=
- Re: merging the same version again and again and again and again and ..., Jim Hyslop, 2006/04/13
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/18
- Re: merging the same version again and again and again and again and ..., Ingolf Steinbach, 2006/04/19
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/21
- Re: merging the same version again and again and again and again, Larry Jones, 2006/04/21
Re: merging the same version again and again and again and again and ..., Larry Jones, 2006/04/11