[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Reviewing merged changes

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-02-04 13:50:04 CET

John Peacock wrote:
> This may be an unsolvable problem (without the use of branches).

It occurred to me over breakfast that svk is actually a viable alternative for
you (if your developers are using the commandline tools). Here's the revised

1) $ svk commit -m "save local changes in local repository"
2) $ svk sync //repos/remote # get changes to trunk
3) $ svk smerge -C //repos/remote //repos/local # check that there no conflicts
4) $ svk smerge //repos/remote //repos/local # apply trunk changes to local copy
5) $ svk up # update sandbox

In this scenario, any local changes are saved to the local repository (step 1)
befor merging, so you could do a diff between steps 1 and 4 to see what changed
in the merge. Checking the merge is optional (but smart). If there was a
conflict, the merge would have to be done against a local WC (but this is true
of base svn as well).



p.s. svk is pre-alpha, but it works suprising well considering that (IMNSHO)

John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4720 Boston Way
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 4 13:50:04 2004

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.