[Top][All Lists]

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

RE: merging between trunks and branches

From: Mark Smith
Subject: RE: merging between trunks and branches
Date: Tue, 8 Apr 2008 05:35:30 -0700 (PDT)

> I assume source.txt is a small test file?  Use a
> real program source
> instead - diff's don't work so well on short files
> and conflicts become
> unavoidable.  Pick a source file with 100 lines and
> test with that.
OK, point taken.

> If you don't like having to specify the two
> revisions all the time CVSNT
> (GPL, unix/linux etc) allows you to merge using bug
> ids, ie: on branch
> b1 "cvs commit -B 1234" then on trunk: "cvs update
> -j b1 -B 1224" (ie:
> cvsnt supports user defined change sets).  Note: if
> you do decide to use
> cvsnt, please subscribe to the cvsnt newsgroup.

If I had a choice I would be using subversion :)

Thanks for the feedback.


You rock. That's why Blockbuster's offering you one month of Blockbuster Total 
Access, No Cost.

reply via email to

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