Daniel 'NebuchadnezzaR' Dehennin <[EMAIL PROTECTED]> writes:
> Le 4773 Septembre 1993, Stefan Reichör a tapoté:
>> Daniel, did you merge from Matthieu?
>> Or did you get this merge from my branch?
>
> I merge from Matthieu.
Do you merge only from Matthieu's branch or did you merge from mine also?
When I run bzr missing from Matthieu's branch, I get the following:
[EMAIL PROTECTED]:~/work/myprg/dvc-matthieu% bzr missing ../dvc-dev-bzr
You have 1 extra revision(s):
------------------------------------------------------------
revno: 67
committer: Matthieu Moy <[EMAIL PROTECTED]>
branch nick: moy
timestamp: Tue 2006-09-26 10:34:02 +0200
message:
Windows-portable `bzr-config-directory'.
You are missing 5 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
But Daniel's rev73 contains some patches that are not yet present in Matthieus
tree:
merged: [EMAIL PROTECTED]
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]>
------------------------------------------------------------
merged: [EMAIL PROTECTED]
committer: Stefan Reichoer <[EMAIL PROTECTED]>
branch nick: dvc-dev-bzr
timestamp: Thu 2006-09-21 20:33:44 +0200
message:
Implemented bzr-revert-files
<snip>
Stefan.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
