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

[Daniel Jacobowitz]

On Wed, Oct 11, 2006 at 10:33:51AM -0400, Derek Atkins wrote:
> 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.

Sorry, I read it just before asking and did not see that.

> 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:
> 
>   sync
>   smerge (if necessary)
>   update
> 
> 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.

No, it's doing exactly what you asked it to.  It's syncing, smerging
from where the current directory was copied from to the current
directory's depotpath, and updating.  The fact that this particular
branch lives in a mirrored directory doesn't make a difference; it's a
copy off of trunk, so pull does an smerge from trunk.

-- 
Daniel Jacobowitz
CodeSourcery