Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Tony Hoyle wrote: >On Tue, 17 Feb 2004 09:48:36 -0000, "Harrison, Andrew" ><andy.harrison at anite.com> wrote: > > > >>--Merge from b2 >> >> >>>--> I now see the test file. >>> >>> >>Ok, that's exactly it. But now look at the CVS headers of the file in >>grs-test1. Does it have a mergepoint flag indicating that it was merged from >>the b2 branch? Mine does not. >> >> > >That's because it's a new file - there's no opportunity to store a >mergepoint there because the client doesn't send entries data back to >the server for new files (deliberately, because they have no version >number so nothing to compare with). > >Everything else follows on logically from that... there may be little >that can be done in that particular case, although I'll keep looking >at it. > >Tony > > I think I see what you mean. If there was a way to have the mergepoint recorded on the 1st commit on a new branch from a merge (in the example below, 1.1.4.1) it would resolve this but there's no entries at that point, which is what the server uses to trigger the mergepoint record. Right? Just trying to understand it so I can explain it correctly if it comes up around here. ---------------------------- revision 1.1 date: 2004/02/17 17:01:11; author: gstarret; state: dead; kopt: kv; commitid: 4cf0403248d76d1f; branches: 1.1.2; 1.1.4; file test-b2b.c was initially added on branch b2. ---------------------------- revision 1.1.4.3 date: 2004/02/17 17:14:34; author: gstarret; state: Exp; lines: +1 -0; kopt: kv; commitid: 4d1b 40324bfac564; mergepoint: 1.1.2.3; 2nd mod, 3rd commit from b2 to grs-test1 ---------------------------- revision 1.1.4.2 date: 2004/02/17 17:04:05; author: gstarret; state: Exp; lines: +1 -0; kopt: kv; commitid: 4d03 4032498528a2; mergepoint: 1.1.2.2; merge from b2, conflict resolved ---------------------------- revision 1.1.4.1 date: 2004/02/17 17:02:16; author: gstarret; state: Exp; lines: +1 -0; kopt: kv; commitid: 4cf4 403249183494; merge b2b file from b2 adding ---------------------------- revision 1.1.2.3 date: 2004/02/17 17:05:32; author: gstarret; state: Exp; lines: +1 -0; kopt: kv; commitid: 4d09 403249dced2c; mod 2 on b2b on b2 ---------------------------- revision 1.1.2.2 date: 2004/02/17 17:03:04; author: gstarret; state: Exp; lines: +1 -0; kopt: kv; commitid: 4cf8 403249487ec4; mod new b2b on b2 ---------------------------- revision 1.1.2.1 date: 2004/02/17 17:01:11; author: gstarret; state: Exp; lines: +1 -0; kopt: kv; commitid: 4cf0 403248d76d1f; mod + new file on b2 ============================================================================= Regards, -- Glen Starrett --(shameless plug)-- Help Scotty get his star: http://www.ScottysStar.com/