-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Am Mo den 5. Dez 2011 um 17:19 schrieb Joey Hess:
> Klaus Ethgen wrote:
> > > Can you check out the git-annex branch and run git-log on uuid.log,
> > > and see what the most recent change to it looked like?
> >
> > It is an update. After that I revert this update and the next time it
> > will purged again.
>
> It sort of sounds as if you are checking out the git-annex branch,
> manually editing and committing a file, and seeing git-annex revert
> that change.
Well, after the Bug happens several times I started to do the following
after git-annex removed the occurrences:
git checkout git-annex
git cherry-pick <id> # This id is the first time I fixed it by hand
git add trust.log uuid.log
git commit -m "Correcting update"
git checkout master
The patch looks somethink like:
diff --git a/trust.log b/trust.log
index xxxxxxx..xxxxxxx 100644
--- a/trust.log
+++ b/trust.log
@@ -1 +1,2 @@
xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx 1 timestamp=1322867090.765867s
+zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz 0 timestamp=1322867165.394761s
diff --git a/uuid.log b/uuid.log
index xxxxxxx..xxxxxxx 100644
--- a/uuid.log
+++ b/uuid.log
@@ -1,2 +1,3 @@
-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx Backup timestamp=1322866827.929813s
yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy Master timestamp=1322866770.445515s
+xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx Backup timestamp=1322866827.929813s
+zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz Clone timestamp=1322867722.827595s
Which is the revert of this two files.
> That's expected behavior actually..
> http://git-annex.branchable.com/internals/ explains why.
Sorry, no it don't. I do not want to modify the git-annex branch as I
know it is internal. But the situation gives me no other choice than to
revert it every and every time.
Regards
Klaus
- --
Klaus Ethgen http://www.ethgen.ch/
pub 4096R/4E20AF1C 2011-05-16 Klaus Ethgen <kl...@ethgen.de>
Fingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQGcBAEBCgAGBQJO3PVpAAoJEKZ8CrGAGfasAPcL/2G12mXQWQcNaDO6tEdL7hkJ
CM5IA8xnxN4cOIWry3YbfDePwQ4Q3/rPnCEj/epGP7QIYB+tatPjJCCz+2ivprc7
GyZtih+C8cwYpad/T/QKEEAM2txMR2uy2kkGy43aFaCN2YRC/2KDmK5ePfxgcRTJ
W+U5VyNu8Aury73WzNGc41e8R/Uple8QZz/r9fvP5c23MtNB83229cjMNBauw4Q6
IHuM0tBNDSY22rZ0MG7WRFgtzgPOZjGsShMVn1TJFpelTheOsCtc0GVjkbwVaGrF
IND2Vo23kBFBlc6vy7g99lra7qAoAZxptfGbqZaMKEWXYVmAMiCB+KiBYE5CcH58
2e4sRbPj2xkVITD9RNlWrH7e/amBpf1w5a+i/gNmHMAGYvX0vYS2abwz+FdwqoQ2
ALhycZFig3kmYlDSw+64lS98j9TwAXdZ2IoBCwnJHRZrbrOLhcfBpmncZRW9TRa6
bW56MR5zZUzMpq8L4xtacmxKputo1WGsNhWXftpOGA==
=uWye
-----END PGP SIGNATURE-----
_______________________________________________
vcs-home mailing list
vcs-home@lists.madduck.net
http://lists.madduck.net/listinfo/vcs-home
