Matthieu Moy <[EMAIL PROTECTED]> writes: > New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/ > ------------------------------------------------------------ > revno: 64
<snip> I'd like to merge from Matthieu, but it seems that your mirror is not up to date: # bzr missing http://www-verimag.imag.fr/~moy/bzr/dvc/moy/ You have 5 extra revision(s): ------------------------------------------------------------ revno: 77 committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Sat 2006-09-23 19:59:42 +0200 message: Merged from Daniel (removed obsolete arch-tags) ------------------------------------------------------------ revno: 76 committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Thu 2006-09-21 20:39:56 +0200 message: Added the new dvc-logo from Andre Kuehne <[EMAIL PROTECTED]> ------------------------------------------------------------ revno: 75 committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Thu 2006-09-21 20:33:44 +0200 message: Implemented bzr-revert-files ------------------------------------------------------------ revno: 74 committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Thu 2006-09-21 20:33:03 +0200 message: xhg-export now creates git style patches by default The variable xhg-export-git-style-patches can be set to nil, to disable the git style patch format ------------------------------------------------------------ revno: 73 committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Thu 2006-09-21 20:32:15 +0200 message: Merged Matthieus fixes for bzr-diff-against Another explaination is, that Daniel has already merged your latest fixes: # bzr log -r77 revno: 77 committer: Stefan Reichoer <[EMAIL PROTECTED]> branch nick: dvc-dev-bzr timestamp: Sat 2006-09-23 19:59:42 +0200 message: Merged from Daniel (removed obsolete arch-tags) ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Daniel Dehennin <[EMAIL PROTECTED]> branch nick: dvc.dev timestamp: Sat 2006-09-23 08:08:16 +0200 message: Remove all the arch tags. ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Daniel Dehennin <[EMAIL PROTECTED]> branch nick: dvc.dev timestamp: Fri 2006-09-22 23:50:07 +0200 message: Fix typo. * debian/dvc.docs: Learn to spell ANNOUNCEMENTS. ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Daniel Dehennin <[EMAIL PROTECTED]> branch nick: dvc.dev timestamp: Fri 2006-09-22 23:42:17 +0200 message: Merge from upstream. ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Matthieu Moy <[EMAIL PROTECTED]> branch nick: moy timestamp: Sat 2006-09-23 02:31:38 +0530 message: Bugfixes. ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Matthieu Moy <[EMAIL PROTECTED]> branch nick: moy timestamp: Sat 2006-09-23 02:11:44 +0530 message: Document conflict management in docs/DVC-API. Anyone to implement this for other back-ends? ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Matthieu Moy <[EMAIL PROTECTED]> branch nick: moy timestamp: Sat 2006-09-23 01:56:58 +0530 message: Conflict management now as good in bzr as in tla/baz. ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Matthieu Moy <[EMAIL PROTECTED]> branch nick: moy timestamp: Sat 2006-09-23 01:27:02 +0530 message: Implemented bzr-resolved. ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Matthieu Moy <[EMAIL PROTECTED]> branch nick: moy timestamp: Fri 2006-09-22 16:18:45 +0530 message: UI improvements for "commit --local" (prompt, offline/online satus...) ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Daniel Dehennin <[EMAIL PROTECTED]> branch nick: dvc.dev timestamp: Fri 2006-09-22 23:37:50 +0200 message: Put docs/* in /usr/share/doc/dvc/ for the debian package. ------------------------------------------------------------ merged: [EMAIL PROTECTED] committer: Daniel Dehennin <[EMAIL PROTECTED]> branch nick: dvc.dev timestamp: Fri 2006-09-22 23:31:40 +0200 message: Update doc: DVC is only fetchable by bzr. So my question is now, how does bzr handle this merge scenario? Daniel's log shows that he has merged from Matthieu. But I don't find his changes in my revision 77. Any explainations for this behaviour? Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
