[Cialug] Version Control

[Jeffrey C. Ollie]

On Sat, 2007-06-09 at 11:07 -0500, Ken MacLeod wrote:

> 
> SVN Tip: SVN will make use of merge history if you tell it the
> revision you last merged with, ie. "merge changes from <other-branch>
> from <last-merged-revision> to <current-revision> into
> <current-branch>".  Google "svn merge revision number" for specifics.
> svnmerge.py can automate that until SVN catches up.

The problem with SVN is that it doesn't keep track of the
last-merged-revision on it's own.  Even then, I've had trouble in the
past with merging in Subversion.  svnmerge.py helps, but it's kind of a
ugly hack.

Jeff
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://cialug.org/pipermail/cialug/attachments/20070609/820a156d/attachment.pgp