Re: [CsMain] Using our GSoC Branches

2009-05-27 Thread smd501
> 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

Re: [CsMain] Using our GSoC Branches

2009-05-27 Thread Scott Johnson
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).

Re: [CsMain] Using our GSoC Branches

2009-05-27 Thread res
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

Re: [CsMain] Using our GSoC Branches

2009-05-27 Thread smd501
> 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