Hi Matthieu! > New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/ > ------------------------------------------------------------ > revno: 296 > revision-id:[EMAIL PROTECTED] > parent: [EMAIL PROTECTED] > committer: Matthieu Moy <[EMAIL PROTECTED]> > branch nick: moy > timestamp: Mon 2008-02-11 11:37:09 +0100 > message: > Added missing (require 'cl) to xgit-log.el > > > === modified file 'lisp/xgit-log.el' > --- a/lisp/xgit-log.el 2007-11-18 17:43:48 +0000 > +++ b/lisp/xgit-log.el 2008-02-11 10:37:09 +0000 > @@ -29,6 +29,7 @@ > > ;;; Code: > > +(eval-when-compile (require 'cl)) > > (defstruct (xgit-revision-st) > hash
When I merge from your branch, I get a conflict. Bzr tells me that a criss-cross merge occured. The suggestion to use the --weave parameter for merge does not help. You have not merged my branch since a long time. I think it is best, when you merge from my branch that you have an up to date branch. Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
