ok, here's a printout of the exact procedure i'm using, which illustrates the problem. as i said previously, i've tested that the saved location and the ../head relative path that i use are the same branch:
Owner@Chug ~ $ cd /bzr/head
Owner@Chug /bzr/head $ bzr pull Using saved location: http://drupal.revisioncontrol.net/core/head All changes applied successfully. 4 revision(s) pulled.
Owner@Chug /bzr/head $ cd ../undo
Owner@Chug /bzr/undo $ bzr merge Using saved location: C:\Program Files\Apache Group\Apache2\htdocs\drupal\cvs.dr upal.org\bzr\head Nothing to do.
Owner@Chug /bzr/undo $ bzr merge ../head All changes applied successfully.
ok, here's a printout of the exact procedure i'm using, which illustrates the problem. as i said previously, i've tested that the saved location and the ../head relative path that i use are the same branch:
Owner@Chug ~
$ cd /bzr/head
Owner@Chug /bzr/head drupal. revisioncontrol .net/core/ head
$ bzr pull
Using saved location: http://
All changes applied successfully.
4 revision(s) pulled.
Owner@Chug /bzr/head
$ cd ../undo
Owner@Chug /bzr/undo htdocs\ drupal\ cvs.dr
$ bzr merge
Using saved location: C:\Program Files\Apache Group\Apache2\
upal.org\bzr\head
Nothing to do.
Owner@Chug /bzr/undo
$ bzr merge ../head
All changes applied successfully.