mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add commit SHAs and remove irrelevant logs

Browse source
This commit is contained in:
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e 2019-09-29 23:49:00 +00:00 • committed by admin
parent 1c1a724f52
commit 8587102c2c
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/bugs/assistant_sometimes_removes_and_re-adds_whole_file.mdwn
View file

@ -13,9 +13,9 @@ This is not 100% reproducible. I haven't figured out any pattern yet as to when
1. Run `enable-tor`, `remotedaemon`, and `p2p --pair` on both
1. Modify the text file
1. Observe that the remote peer ends up with three new commits on `master` rather than one; from oldest to newest:
1. The commit received via tor from the source side
2. A local commit removing the text file
3. A local commit adding it back with identical contents
1. The commit received via tor from the source side (4bd9c99 in the below example)
2. A local commit removing the text file (1ef9061)
3. A local commit adding it back with identical contents (e662a33)
### What version of git-annex are you using? On what operating system?
@ -68,16 +68,6 @@ error: failed to push some refs to 'tor-annex::rpxkm55i6gxlirqohcjup4g4orlgzyval
[2019-09-29 23:44:23.623525612] Pusher: Syncing with peer1
To tor-annex::rpxkm55i6gxlirqohcjup4g4orlgzyval2n2yymah36ekipjcppmrvid.onion:42294
1ef9061..e662a33 master -> synced/master
[2019-09-29 23:45:45.259976537] RemoteControl: Syncing with peer1
From tor-annex::rpxkm55i6gxlirqohcjup4g4orlgzyval2n2yymah36ekipjcppmrvid.onion:42294
e662a33..e86c66a master -> peer1/master
e662a33..e86c66a synced/master -> peer1/synced/master
Updating e662a33..e86c66a
Fast-forward
TODO.org | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
# End of transcript or log.
"""]]