2009/12/21 Martin Pool <email address hidden>:
> I think this is already addressed in bzr through 'reconfigure --stacked-
> on/--unstacked'. If you think that's not enough, please reopen the bug
> and tell us why and how.
>
The how:
$ bzr ci --unchanged -m "Commit 1"
$ bzr push lp:~dmitrij.ledkov/xiphos/commit-1
Using default stacking branch /~xiphos-devel/xiphos/trunk at
lp-64802192:///~dmitrij.ledkov/xiphos
Created new stacked branch referring to /~xiphos-devel/xiphos/trunk.
$ bzr ci --unchanged -m "Commit 2"
$ bzr push lp:~dmitrij.ledkov/xiphos/commit-2
Using default stacking branch /~xiphos-devel/xiphos/trunk at
lp-64802192:///~dmitrij.ledkov/xiphos
Created new stacked branch referring to /~xiphos-devel/xiphos/trunk.
#trying harder
$ bzr reconfigure lp:~dmitrij.ledkov/xiphos/commit-2 --stacked-on
bzr+ssh://bazaar.launchpad.net/~dmitrij.ledkov/xiphos/commit-1
bzr+ssh://bazaar.launchpad.net/~dmitrij.ledkov/xiphos/commit-2/ is now
stacked on ../commit-1
2009/12/21 Martin Pool <email address hidden>:
> I think this is already addressed in bzr through 'reconfigure --stacked-
> on/--unstacked'. If you think that's not enough, please reopen the bug
> and tell us why and how.
>
The how:
$ bzr ci --unchanged -m "Commit 1" devel/xiphos/ trunk at ///~dmitrij. ledkov/ xiphos devel/xiphos/ trunk.
$ bzr push lp:~dmitrij.ledkov/xiphos/commit-1
Using default stacking branch /~xiphos-
lp-64802192:
Created new stacked branch referring to /~xiphos-
$ bzr ci --unchanged -m "Commit 2" devel/xiphos/ trunk at ///~dmitrij. ledkov/ xiphos devel/xiphos/ trunk.
$ bzr push lp:~dmitrij.ledkov/xiphos/commit-2
Using default stacking branch /~xiphos-
lp-64802192:
Created new stacked branch referring to /~xiphos-
$ bzr reconfigure lp:~dmitrij.ledkov/xiphos/commit-2 --stacked-on dmitrij/ src/upstream/ xiphos/ bla/lp:~dmitrij.ledkov/xiphos/commit-1/".
lp:~dmitrij.ledkov/xiphos/commit-1
bzr: ERROR: Not a branch:
"/home/
#trying harder //bazaar. launchpad. net/~dmitrij. ledkov/ xiphos/ commit- 1 //bazaar. launchpad. net/~dmitrij. ledkov/ xiphos/ commit- 2/ is now
$ bzr reconfigure lp:~dmitrij.ledkov/xiphos/commit-2 --stacked-on
bzr+ssh:
bzr+ssh:
stacked on ../commit-1
lp:~dmitrij.ledkov/xiphos/commit-2 is now a broken branch (still up on
launchpad)
The why: resulting branch is broken (not valid).
--
With best regards
Dmitrijs Ledkovs (for short Dima),
Ледков Дмитрий Юрьевич
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments