emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Workflow to accumulate individual changes?


From: Eli Zaretskii
Subject: Re: Workflow to accumulate individual changes?
Date: Sat, 02 Jan 2010 11:10:14 +0200

> From: "Stephen J. Turnbull" <address@hidden>
> Date: Sat, 02 Jan 2010 12:46:30 +0900
> Cc: Emacs developers <address@hidden>
> 
> bzr branch trunk build-test
> cd build-test
> make bootstrap
> make test                 # if you like, but should be OK :-)
> for i = 1 2 3; do
>   cd ..
>   bzr branch trunk fix$i
>   cd fix$i
>   # hack
>   bzr commit -m "fix$i"
>   cd ../build-test
>   bzr checkout ../fix$i
>   make                    # Look Ma, no 'bootstrap'!
>   make test
> done

What is the semantics of "bzr checkout ../fix$i" in this case?  What
does it do, exactly?

Bazaar docs are not very clear on that, to say the least:

    Purpose: Create a new checkout of an existing branch.

But fix$i is already an existing branch, and one with local changes,
so this ``create'' seems not quite the right word here.

    Usage: bzr checkout [BRANCH_LOCATION] [TO_LOCATION]

    Description: If BRANCH_LOCATION is omitted, checkout will reconstitute
                 a working tree for the branch found in ‘.’.
                 [...]
                 If the TO_LOCATION is omitted, the last component of the
                 BRANCH_LOCATION will be used. In other words, “checkout
                 ../foo/bar” will attempt to create ./bar. If the
                 BRANCH_LOCATION has no / or path separator embedded,
                 the TO_LOCATION is derived from the BRANCH_LOCATION
                 by stripping a leading scheme or drive identifier, if
                 any. For example, “checkout lp:foo-bar” will attempt
                 to create ./foo-bar.

Again, ``create ./bar'' sounds incorrect in the context of your
suggestion.  ``Reconstitute a working tree'', OTOH, sounds too obscure
to help.

So what does this "checkout" do in this case?

(Btw, note the tricky convention regarding slashes, not for the faint
of heart IMO.)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]