On 3/31/07, Stefan Reichör <[EMAIL PROTECTED]> wrote:
"Dan Lipsitt" <[EMAIL PROTECTED]> writes:

> Does DVC have a bzr-merge command?

I have implemented now a very simple form that calls only "bzr merge branch"

Thanks!

Do you need some extra parameters?

Here's my situation: I am hoping to switch my lab over from Arch to
Bazaar. I have switched everybody from xtla to dvc. I am experimenting
with bzr and they are still using tla. However, there are several
things that I used to be able to do with dvc/tla that seem to be
missing from dvc/bzr. Some of these may be due to differences between
Arch and Bazaar, but others aren't. I've been making a list:

- Bookmarks seem to be Arch-specific.
- Partners are gone. I know that bzr stores at least the source of the
last pull. Does it record other repos? Is there a way that dvc can
track this otherwise? Maybe bookmarks could serve this purpose
(something like bzr-{merge,missing}-from-bookmark).
- Can't merge/cherrypick from bzr-missing screen.
- Can't jump to conflicts from bzr-status screen.

There are also instances where dvc assumes that I am using tla. I
sometimes get an error saying "not an arch managed tree" when I am in
a bzr-managed directory. I will try to collect these as they come up.
Lastly, the documentation at
http://download.gna.org/dvc/docs/dvc-snapshot.html only covers tla.

Thanks,
Dan

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to