centralized workflow and tracking upstream questions

[Tom Vaughan]

On Fri, Apr 4, 2008 at 11:50 AM, Neil Martinsen-Burrell
<nmb at wartburg.edu> wrote:
> Tom Vaughan wrote:
>
> >
> > On Thu, Apr 3, 2008 at 1:52 PM, Neil Martinsen-Burrell<nmb at wartburg.edu>
> wrote:
> >
> > >
> > > Tom Vaughan<tom<at>  software6.net>  writes:
> > >
> > >  To do this with a centralized repository, you should be able to just
> create
> > >  site/vendor and site/mysite as (lightweight-) checkouts of some remote
> branch.
> > >  Then, each commit will propagate to the bound remote branch when it is
> locally
> > >  committed.
> > >
> >
> >
> > I think I did this correctly. This is one point I'm really perplexed
> > about. I'm sorry if this is covered elsewhere. But when I import the
> > first vendor version, and then merge that onto the trunk for the first
> > time, I wind up with all the files from the vendor branch added to the
> > trunk. At this point I still haven't checked them in (I did a `bzr
> > init ...` and a `bzr co ...`), but yet I can't check-in unless I
> > specify --unchanged. And after I do, I wind up with two new revisions.
> > Why? The first from branch nick "vendor," the second from branch nick
> > "trunk." When I do subsequent imports of other vendor releases, and
> > merge those onto the trunk I don't have to provide --unchanged, and
> > when I check-in I only wind up with one new revision.
> >
>
>  I'm not sure that I understand what you are talking about here.  Can you
> show commands and output from an actual session so we can be on the same
> page?  What is the result of ``bzr st`` after you merge the vendor branch
> onto the trunk?  What do you mean when you say "I can't check in unless I
> specify --unchanged"?  Is there an error message when you try to do what you
> want?
>
>  We should be able to sort this out with more information.

$ mkdir website
$ bzr init-repo website/
$ mkdir website/trunk
$ bzr init website/trunk/
$ mkdir -p website/branches/vendor
$ bzr init website/branches/vendor/
$ bzr co website/branches/vendor/
$ cd vendor/
$ bzr import ../template-0.1/ .
$ bzr ci -m "imported vendor release 0.1"
Committing to: /home/tvaughan/website/branches/vendor/
added index.html
Committed revision 1.
$ cd ..
$ bzr co website/trunk/
$ cd trunk/
$ bzr merge ../vendor/
+N  index.html
All changes applied successfully.
$ bzr st
working tree is out of date, run 'bzr update'
$ bzr ci -m "merged vendor release 0.1"
Committing to: /home/tvaughan/website/trunk/
bzr: ERROR: no changes to commit. use --unchanged to commit anyhow
$ bzr ci -m "merged vendor release 0.1" --unchanged
Committing to: /home/tvaughan/website/trunk/
Committed revision 1.
$ bzr log
------------------------------------------------------------
revno: 2
committer: Tom Vaughan <tvaughan at lindero>
branch nick: trunk
timestamp: Fri 2008-04-04 12:13:44 -0700
message:
  merged vendor release 0.1
------------------------------------------------------------
revno: 1
committer: Tom Vaughan <tvaughan at lindero>
branch nick: vendor
timestamp: Fri 2008-04-04 12:12:16 -0700
message:
  imported vendor release 0.1

Thanks Neil.

-Tom