svk pull explained (was: Re: [svk-devel] 2.0-pre "svk pull" tries to merge back to mirror source?)

[Michael Brouwer]

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.

If you don't want to pull in the latest changes from trunk to a branch, use
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.

Note this is not svk2 specific this is just how svk pull has always worked.

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.

Michael


On 10/11/06, Derek Atkins <warlord at mit.edu> 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.
>
> 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.
>
> -derek
>
> --
>        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
>
> _______________________________________________
> svk-devel mailing list
> svk-devel at bestpractical.com
> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-devel/attachments/20061011/a2fa4f23/attachment.htm