[svk-devel] 2.0-pre "svk pull" tries to merge back to mirror source?

Derek Atkins warlord at MIT.EDU
Wed Oct 11 10:33:51 EDT 2006

Quoting Daniel Jacobowitz <drow at false.org>:

> On Tue, Oct 10, 2006 at 02:07:51PM -0400, Derek Atkins wrote:
>> Now some changes are made to the repository, so I want to "svk pull":
>> From the followup discussion, I wonder if you actually just wanted an
> svk sync here... what've you got checked out in $PWD?

Well, what I /have/ to do is "svk sync; svk update" because as I said
in my first email I've got a WC of //mirrors/gnucash/branches/swig-redo
in $PWD.

I just don't want to have to think about whether $PWD is a WC of
a mirror or a WC of a local branch.  I could have tens or hundreds
of WCs lying around as I work on different projects.  What I want
is a single command that is:

   smerge (if necessary)

I /thought/ that "pull" would do what I wanted, but clearly not..  It's
not smart enough to notice that there's no "branch" to merge from and
instead it should skip the merge step and just perform the sync and update.


       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord at MIT.EDU                        PGP key available

More information about the svk-devel mailing list