Actually svk pull noticed there was a branch to merge from and did just that. "...gnucache//branches/swig-redo" is a branch of "../gnucache/trunk", so svk pull will bring the swig-redo branch up to date with changes made in trunk since the last copy or smerge from trunk to this branch, and then update your working copy.
<br><br>If you don't want to pull in the latest changes from trunk to a branch, use<br>svk update --sync (or svk up -s for short) instead. This will sync your mirror and update your wc, but not merge changes to the branch from it's copy-from source.
<br><br>Note this is not svk2 specific this is just how svk pull has always worked.<br><br>What it sounds like you are asking for is a version of svk pull that behaves like svk update --sync unless the branch you are pulling to is a local branch. There isn't currently any precedent for svk command to work differently on remote
v.s. local branches, but if you can show why this is needed and suggest a new command line syntax for it perhaps it can be added.<br><br>Michael<br><br><br><div><span class="gmail_quote">On 10/11/06, <b class="gmail_sendername">
Derek Atkins</b> <<a href="mailto:warlord@mit.edu">warlord@mit.edu</a>> wrote:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Quoting Daniel Jacobowitz <
<a href="mailto:drow@false.org">drow@false.org</a>>:<br><br>> On Tue, Oct 10, 2006 at 02:07:51PM -0400, Derek Atkins wrote:<br>>> Now some changes are made to the repository, so I want to "svk pull":
<br>><br>>> From the followup discussion, I wonder if you actually just wanted an<br>> svk sync here... what've you got checked out in $PWD?<br><br>Well, what I /have/ to do is "svk sync; svk update" because as I said
<br>in my first email I've got a WC of //mirrors/gnucash/branches/swig-redo<br>in $PWD.<br><br>I just don't want to have to think about whether $PWD is a WC of<br>a mirror or a WC of a local branch. I could have tens or hundreds
<br>of WCs lying around as I work on different projects. What I want<br>is a single command that is:<br><br> sync<br> smerge (if necessary)<br> update<br><br>I /thought/ that "pull" would do what I wanted, but clearly not.. It's
<br>not smart enough to notice that there's no "branch" to merge from and<br>instead it should skip the merge step and just perform the sync and update.<br><br>-derek<br><br>--<br> Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
<br> Member, MIT Student Information Processing Board (SIPB)<br> URL: <a href="http://web.mit.edu/warlord/">http://web.mit.edu/warlord/</a> PP-ASEL-IA N1NWH<br> <a href="mailto:warlord@MIT.EDU">warlord@MIT.EDU
</a> PGP key available<br><br>_______________________________________________<br>svk-devel mailing list<br><a href="mailto:svk-devel@bestpractical.com">svk-devel@bestpractical.com</a><br><a href="http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel">
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel</a><br></blockquote></div><br>