clone 419814 -1
retitle -1 tailor: does not handle correctly binary files in git backend
severity -1 normal
thanks
Hi,
The next upload will close this bug as tailor works with current git-core.
However, I'm cloning the bug as there is always some problems with binary
files.
With the example you provided, I stop with:
12:42:35 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
12:42:35 [I] Changeset #435
12:42:35 [I] Changeset "d070e9e139d5e0eccdbb635ddcb544e41776a75c"
12:42:35 [I] Log message: modified questions to be more accurate and appealing
12:42:35 [D] Going to apply changeset:
Revision: d070e9e139d5e0eccdbb635ddcb544e41776a75c
Date: 2007-03-14 20:46:38+09:00
Author: Junichi Uekawa <[EMAIL PROTECTED]>
Entries: beamerthemeTokyo.sty(ADD),
debianmeetingresume200703-presentation.pdf(UPD),
debianmeetingresume200703-presentation.tex(UPD),
debianmeetingresume200703.pdf(UPD), debianmeetingresume200703.tex(UPD),
image200703/goodbyemicrosoftcom1.bb(UPD),
image200703/goodbyemicrosoftcom2.bb(UPD),
image200703/goodbyemicrosoftcom3.bb(UPD),
image200703/goodbyemicrosoftcom4.bb(UPD),
image200703/goodbyemicrosoftcom5.bb(UPD),
image200703/goodbyemicrosoftcom6.bb(UPD),
image200703/goodbyemicrosoftcom7.bb(UPD), image200703/janken-A.bb(ADD),
image200703/janken-A.png(ADD), image200703/janken-B.bb(ADD),
image200703/janken-B.png(ADD), image200703/janken-C.bb(ADD),
image200703/janken-C.png(ADD)
Log: modified questions to be more accurate and appealing
12:42:35 [I] /tmp/test/tailor/tokyo-debian/git $ git merge -n --no-commit
fastforward HEAD d070e9e139d5e0eccdbb635ddcb544e41776a75c
12:42:35 [D] Executing git merge -n --no-commit fastforward HEAD
d070e9e139d5e0eccdbb635ddcb544e41776a75c ('/tmp/test/tailor/tokyo-debian/git')
warning: Cannot merge binary files:
HEAD:debianmeetingresume200703-presentation.pdf vs.
d070e9e139d5e0eccdbb635ddcb544e41776a75c:debianmeetingresume200703-presentation.pdf
warning: Cannot merge binary files: HEAD:debianmeetingresume200703.pdf vs.
d070e9e139d5e0eccdbb635ddcb544e41776a75c:debianmeetingresume200703.pdf
Automatic merge failed; fix conflicts and then commit the result.
12:42:37 [W] [Status 1]
Output stream:
Auto-merged debianmeetingresume200703-presentation.pdf
CONFLICT (content): Merge conflict in debianmeetingresume200703-presentation.pdf
Auto-merged debianmeetingresume200703-presentation.tex
CONFLICT (content): Merge conflict in debianmeetingresume200703-presentation.tex
Auto-merged debianmeetingresume200703.pdf
CONFLICT (content): Merge conflict in debianmeetingresume200703.pdf
Auto-merged debianmeetingresume200703.tex
12:42:37 [C] Couldn't apply changeset: /tmp/test/tailor/tokyo-debian/git $ git
merge -n --no-commit fastforward HEAD d070e9e139d5e0eccdbb635ddcb544e41776a75c
failed
12:42:37 [D] Changeset: Revision: d070e9e139d5e0eccdbb635ddcb544e41776a75c
Date: 2007-03-14 20:46:38+09:00
Author: Junichi Uekawa <[EMAIL PROTECTED]>
Entries: beamerthemeTokyo.sty(ADD),
debianmeetingresume200703-presentation.pdf(UPD),
debianmeetingresume200703-presentation.tex(UPD),
debianmeetingresume200703.pdf(UPD), debianmeetingresume200703.tex(UPD),
image200703/goodbyemicrosoftcom1.bb(UPD),
image200703/goodbyemicrosoftcom2.bb(UPD),
image200703/goodbyemicrosoftcom3.bb(UPD),
image200703/goodbyemicrosoftcom4.bb(UPD),
image200703/goodbyemicrosoftcom5.bb(UPD),
image200703/goodbyemicrosoftcom6.bb(UPD),
image200703/goodbyemicrosoftcom7.bb(UPD), image200703/janken-A.bb(ADD),
image200703/janken-A.png(ADD), image200703/janken-B.bb(ADD),
image200703/janken-B.png(ADD), image200703/janken-C.bb(ADD),
image200703/janken-C.png(ADD)
Log: modified questions to be more accurate and appealing
12:42:37 [D] Adjusting the state accordingly to journal
12:42:38 [I] 527 pending changesets in state file
12:42:38 [C] Upstream change application failed
Failure applying upstream changes: /tmp/test/tailor/tokyo-debian/git $ git
merge -n --no-commit fastforward HEAD d070e9e139d5e0eccdbb635ddcb544e41776a75c
failed
Best regards
Vincent
--
Vincent Danjean GPG key ID 0x9D025E87 [EMAIL PROTECTED]
GPG key fingerprint: FC95 08A6 854D DB48 4B9A 8A94 0BF7 7867 9D02 5E87
Unofficial pacakges: http://www-id.imag.fr/~danjean/deb.html#package
APT repo: deb http://perso.debian.org/~vdanjean/debian unstable main
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
