'merge' merged

[Erik Bågfors]

Now I feel really stupid. But how do I specify base?

I have the following

: [bagfors at zyrgelkwyt]$ ; pwd
/home/bagfors/tmp/t/repo1

#[Sun May 15 13:09:01]:~/tmp/t/repo1
: [bagfors at zyrgelkwyt]$ ; bzr log
------------------------------------------------------------
revno: 1
committer: Erik Bågfors <bagfors at zyrgelkwyt>
timestamp: Sun 2005-05-15 12:58:33 +0200
message:
  added passwd
------------------------------------------------------------
revno: 2
committer: Erik Bågfors <bagfors at zyrgelkwyt>
timestamp: Sun 2005-05-15 12:59:45 +0200
message:
  bagfors->erik
------------------------------------------------------------
revno: 3
committer: Erik Bågfors <bagfors at zyrgelkwyt>
timestamp: Sun 2005-05-15 13:02:29 +0200
message:
  backup->bakkaup

#[Sun May 15 13:09:04]:~/tmp/t/repo1
: [bagfors at zyrgelkwyt]$ ; cd ../repo1a

#[Sun May 15 13:09:07]:~/tmp/t/repo1a
: [bagfors at zyrgelkwyt]$ ; bzr log
------------------------------------------------------------
revno: 1
committer: Erik Bågfors <bagfors at zyrgelkwyt>
timestamp: Sun 2005-05-15 12:58:33 +0200
message:
  added passwd
------------------------------------------------------------
revno: 2
committer: Erik Bågfors <bagfors at zyrgelkwyt>
timestamp: Sun 2005-05-15 12:59:45 +0200
message:
  bagfors->erik
------------------------------------------------------------
revno: 3
committer: Erik Bågfors <bagfors at zyrgelkwyt>
timestamp: Sun 2005-05-15 13:03:08 +0200
message:
  syslog->logger

As you can see revno 2 are the last merge (or.. the cp -a :) )

Then I have tried
: [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 at 2 . at 2
: [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 . at 2
: [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 @2
and finaly 
: [bagfors at zyrgelkwyt]$ ; bzr merge ../repo1 .
which worked but overwrote rev 3 in the current tree.

Cheers,
Erik

On 5/15/05, Martin Pool <mbp at sourcefrog.net> wrote:
> I've incorporated Aaron's patch to add a 'merge' command.  Thanks Aaron!
> 
> At the moment this requires a 'base' revision to be manually
> specified.  The 'base' is some common point between the two trees that
> are to be merged.  For example, if you are merging from my tree into
> yours, then the 'base' will be the previous revision that was merged
> across.
> 
> In the short term there are several things we can do:
> 
> - add online help and instructions into the tutorial
> 
> - automatic selection of a base version
> 
> In the longer term, I am not sure that a simple three-way merge will
> really be enough, and we should explore some ideas from arch,
> codeville, and other systems.
> 
> --
> Martin
> 
> 
> BodyID:118231593.2.n.logpart (stored separately)
> 
> --
> bazaar-ng mailing list
> bazaar-ng at lists.canonical.com
> http://lists.canonical.com/mailman/listinfo/bazaar-ng
> 
> 
>