> To get svnmerge working do this;
>
> In your clean checkout run (only do this once);
> svnmerge(.exe) init
> svn ci -F svnmerge-commit-message.txt
>
> Then to see what's available to merge do;
> svnmerge(.exe) avail -S trunk
>
> This will give you a list of all revisions you can merge into your
Hi Seth:
Usually, we use svnmerge.py, as this keeps track of revisions and
comments from the merged branches. I have run this from windows before,
but you need python 2.5 installed, and I use msys (you can probably just
use the command prompt, but I use msys for other stuff, so I use that).
On 27.05.2009 12:38, smd...@student.cs.york.ac.uk wrote:
> Could someone please do this for the branch:
> https://cel.svn.sourceforge.net/svnroot/cel/cel/branches/soc2009/quests/
>
> I do not have a password to do so myself. Should we at this time have a
> password for our branch?
You need a sour
> Quite important: "svnmerge.py init" must be run first before one can use
> svnmerge in a branch. You shall run it yourself in your branch then
> commit,
> or just ask here for someone to do it.
Could someone please do this for the branch:
https://cel.svn.sourceforge.net/svnroot/cel/cel/branches
> A further note: CS repository does not presently utilize the new
> SVN-native merging capability introduced with SVN 1.5. Instead, as Mike
> pointed out, merging in CS presently is under control (normally) of
> svnmerge.py script. The TortoiseSVN merging support is based upon SVN's
> built-in mer
A further note: CS repository does not presently utilize the new
SVN-native merging capability introduced with SVN 1.5. Instead, as Mike
pointed out, merging in CS presently is under control (normally) of
svnmerge.py script. The TortoiseSVN merging support is based upon SVN's
built-in merging f
2009/5/26 Seth Berrier
> Anyways, any advice on this or general tips on working with my SoC branch
> (i.e. should I even be worrying about this when everything compiles okay)
> would be much appreciated.
CS maintainers tend to use 'svnmerge.py' to handle merging, it's quite easy
to use.
http:
Greetings!
I'm needing some help working with my GSoC SVN branch. I should preface
this by saying I can checkout and compile my branch just fine (no errors).
Regardless, it seems like a good idea to merge in any changes from the trunk
before I begin (and at the very least know how to do this shou
