Lakshman Srilakshmanan wrote:
> Hi ,
>
> Thanks to all who helped me through my preparation to roll out
> subversion in our organisation.
> I am near the end of my evaluation and have just 2 question before
> submitting my recommendation and then preparing the migration path.
>
> Question 1.
> I find from the user archive that there is no merge tracking feature in
> subversion to prevent double merging the same revision. I also note that
> it is in the road map for future development. The road map does not
> provide an indication of the timeframe to implement this feature.
> Q1. Is there an idea of timeframe when this feature will be incorporated
> ?
> Q2. What is the work around today. Is there a best practice to follow ?
> Or do we just need to keep a manual note and track merging revision
> manually.
>
Since you say you need a command line version, and assuming you use it for the
merge, my usual practice is
bash > echo svn merge -rFROM:TO . >>merge.txt
bash > svn merge -rFROM:TO . >> merge.txt
...
bash > svn commit -F merge.txt
Depending upon the merge, I'll usually edit merge.txt prior to the commit,
deleting the detailed lines of which files got merged and adding in a comment on
why the merge was done. But regardless of whatever else you put into the file,
the trick here is that the command line recall of your favorite shell makes it
very easy to capture the original merge command, even if you forget to do it
before the merge (as long as it's still in your history).
One caveat: Don't record the merge, or even do the merge as -r###:HEAD, because
HEAD changes and you may not remember to track the actual version.
Of course, if your request for a cli client had no connection to doing the
merges, then this may not be useful for you.
Gary
> Question 2.
> I need a command line client for windows/linux/Unix.
> Do I just download the full version and use it as a client or is there a
> stripped-down svn containing the client side only (including command
> line).
> SVNTortoise does not appear to provide a command line interface.
>
>
> Your help is answering the above question will most gratefully
> appreciated.
>
> Thanks
> Lakshman
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 17 00:14:24 2006