Daniel 'NebuchadnezzaR' Dehennin <[EMAIL PROTECTED]> writes:
> Le 4773 Septembre 1993, Stefan Reichör a tapoté:
>> One possible scenario is that Daniel merged from you and undid
>> your changes.
>
> Well, I do not do such things, I wonder what's happend.
>
> I'll look at the graph to try to understand...
>
> Regards.
Daniel, I have branched your repository.
bzr log -r73 starts with the following:
revno: 73
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: 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>
Then I experimented with the following commands:
bzr diff -r72..73
bzr bundle -r72..73
I don't see Matthieu's patches in the diff output
The output from bundle shows them base64 encoded...
Daniel, did you merge from Matthieu?
Or did you get this merge from my branch?
If you got it from me, then my bzr must have recorded Matthieu's
patches. But the patches were not applied somehow...
Matthieu, I can extract your patches from your repository via
bzr diff and apply them to my brach.
Shall I do that?
Stefan.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
