Subversion utilities

[Anil Arora <an...@interlacesystems.com>]

Hi, all.  

 

I've been testing subversion for the last month, and I definitely like it a
lot better than VSS which we are currently using.  

After coming from a company that used Perforce, I'm finding a lot of
inconveniences with Subversion.  In particular, the branching/merging stuff
is a little painful.  

 

Each developer is working in their own branch off the trunk and routinely
needs to merge changes from the trunk into the branch (I tend to do this
once every two days).  Also, the reverse will be needed when developers want
to merge their branch into the trunk.  It's seems inconvenient to have to
remember the revision number for the last merge, everytime.  Couldn't
subversion keep track of this information automatically so that I don't have
to specify the revision when I run svn merge?  

As a workaround, I was thinking of writing some perl script to wrap around
the svn merge to keep track of the merge points in a file that is also
checked into subversion at some particular location.  It's basically a hack,
but it would get me around this pain point.

 

Before I start writing my own scripts to hide these inconveniences in
subversion, I wanted to see what people have come up with that could help.  

Is there some user-contrib repository that I can contribute/download from?
I see references in the "post-commit.tmpl" file to "commit-email.pl" and
"log-commit.py" scripts.  Do those files exist somewhere?

 

Thanks,

 

Anil

Re: Subversion utilities

[John Peacock <jp...@rowman.com>]

Anil Arora wrote:

> It’s seems inconvenient to have to remember the revision number for the last
> merge, everytime.  Couldn’t subversion keep track of this information 
> automatically so that I don’t have to specify the revision when I run svn
> merge?

As long as you aren't using Win32, you can use svk:

	http://svk.elixus.org/

which supports smart merging out of the box.  The primary gotcha is that each 
developer winds up having a personal mirror of the main repository.

As soon as someone can get the SWIG Perl bindings working under Win32, it should 
be possible to do this with Win32 clients too.

John


-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org