On Thu, 2006-01-12 at 19:47 -0500, David Hampton wrote: > On Thu, 2006-01-12 at 22:46 +0000, Neil Williams wrote: > > > My biggest problem with the merges to the cashutil branch is just knowing > > which revisions to specify - it seems to be a black art. I've done one > > merge > > to bring updated gnucash trunk code into the cashutil branch (so that the > > branch had lib/libqof) and it took me ages to work out how to do it. e.g. > > How > > do I find out which is the starting revision? > > I read somewhere that the easiest way to do this is to stick the last > merged revision number into the commit message somewhere. Then all you > need do the next rime round is run 'svn log' on any file to find out > where to start.
If the branch has never been merged, it becomes a bit easier with `svn log --stop-on-copy` ... which will print the log but stopping at the point of any copy ... like the one where the branch was created. But since svn doesn't record merge history, if you do periodic "sync" merges, you need to record the merge revision in comments, as David notes. -- ...jsled http://asynchronous.org/ - `a=jsled; b=asynchronous.org; echo [EMAIL PROTECTED] _______________________________________________ gnucash-devel mailing list [email protected] https://lists.gnucash.org/mailman/listinfo/gnucash-devel
