summaryrefslogtreecommitdiff
path: root/doc/todo/Recovering_from_a_bad_sync.mdwn
blob: d60406568c712a88ca339a805045d6a9a3d2d924 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Instead of using `sync origin` for the first sync and a simple `sync` for the other syncs,

    # on pc1
    git annex init "pc1"
    git annex direct
    git annex add .
    git annex sync origin # remote specified on the first sync

    # add some files
    git annex add .
    git annex sync

I used `sync` first and only later I used `sync origin`

     # on pc1
    git annex init "pc1"
    git annex direct
    git annex add .
    git annex sync

    # add some files
    git annex add .
    git annex sync origin  # remote specified on a later sync

These sequences of commands create two completely different git histories.

More important, if one clones on pc2 the first repository, they will see both the pc1 remote and the pc2 remote. Instead, if one clones on pc2 the repository created by the second combination of commands, they will see only the pc2 remote.

What commands should I use on pc1 to fix the history so that when pc2 clones from the origin repository it will see both the pc1 remote and its own local remote?

> [[done]]; fixed per my comments. --[[Joey]]