Re: [PATCH] Change tracking for 1.3cvs

2002-12-04 Thread Lars Gullik Bjønnes
Allan Rae <[EMAIL PROTECTED]> writes: | Does GCC really have long living branches with multiple merges from | the trunk into the branch? yes. | If so, they must know something a lot of others don't. perhaps. The crucial things is to tag HAED and branch, so that you have something to merge agai

Re: [PATCH] Change tracking for 1.3cvs

2002-12-04 Thread Allan Rae
On 4 Dec 2002, Lars Gullik Bjønnes wrote: > Allan Rae <[EMAIL PROTECTED]> writes: > > | On Wed, 4 Dec 2002, John Levon wrote: > | > | [...] > | > With all that administration, I'm even less inclined to do so then. > | > > | > CVS is worse at handling conflicts in such cases than patch is > | > | B

Re: [PATCH] Change tracking for 1.3cvs

2002-12-04 Thread Lars Gullik Bjønnes
Allan Rae <[EMAIL PROTECTED]> writes: | On Wed, 4 Dec 2002, John Levon wrote: | | [...] | > With all that administration, I'm even less inclined to do so then. | > | > CVS is worse at handling conflicts in such cases than patch is | | But at least CVS allows others to keep up to date with your w

Re: [PATCH] Change tracking for 1.3cvs

2002-12-03 Thread Allan Rae
On Wed, 4 Dec 2002, John Levon wrote: [...] > With all that administration, I'm even less inclined to do so then. > > CVS is worse at handling conflicts in such cases than patch is But at least CVS allows others to keep up to date with your work and fiddle along with you. All you need to do is w

Re: [PATCH] Change tracking for 1.3cvs

2002-12-03 Thread John Levon
On Wed, Dec 04, 2002 at 12:07:07PM +1000, Allan Rae wrote: > Then you should do as many other CVS-based projects do (gdb for > example) and start a new branch every so often and roll your > patch (branch to original trunk point) forward. > > I've found that merging the trunk into the branch works

Re: [PATCH] Change tracking for 1.3cvs

2002-12-03 Thread Allan Rae
On Sat, 30 Nov 2002, John Levon wrote: > On Sat, Nov 30, 2002 at 11:39:49PM +0100, Lars Gullik Bjønnes wrote: > > > | I intend to soon when I find a merging guide that works as advertised > > | (neither of Lars' do) > > > > sure they do... > > (what is not working?) > > Trying to merge up trunk c

Re: [PATCH] Change tracking for 1.3cvs

2002-11-30 Thread John Levon
On Sat, Nov 30, 2002 at 11:39:49PM +0100, Lars Gullik Bjønnes wrote: > | I intend to soon when I find a merging guide that works as advertised > | (neither of Lars' do) > > sure they do... > (what is not working?) Trying to merge up trunk changes to the branch, it didn't work properly. http://

Re: [PATCH] Change tracking for 1.3cvs

2002-11-30 Thread Lars Gullik Bjønnes
John Levon <[EMAIL PROTECTED]> writes: | On Sat, Nov 30, 2002 at 01:34:53PM +0200, Dekel Tsur wrote: | | > How about creating a branch for it ? | | I intend to soon when I find a merging guide that works as advertised | (neither of Lars' do) sure they do... (what is not working?) -- L

Re: [PATCH] Change tracking for 1.3cvs

2002-11-30 Thread John Levon
On Sat, Nov 30, 2002 at 01:34:53PM +0200, Dekel Tsur wrote: > How about creating a branch for it ? I intend to soon when I find a merging guide that works as advertised (neither of Lars' do) regards john -- "Trolls like content too." - Bob Abooey, /.

Re: [PATCH] Change tracking for 1.3cvs

2002-11-30 Thread Dekel Tsur
On Sat, Nov 30, 2002 at 12:37:23AM +, John Levon wrote: > > I updated the patch. This is not so well-tested, but feel free to give > it a go. (updating was FUN ! over 100 hunks hand-merged) How about creating a branch for it ?