threads / discuss / 6517

two-way sync; from firewalled host

Subject: two-way sync; from firewalled host

## tl;dr

3 messages between Jan 25, 2007 and Feb 3, 2007.

replies: 2people: 2as markdown or json

Yakov Lerner· Jan 25, 2007, 11:31 UTC · lore

I have two hosts, host C which is firewalled (no sshd), and host S which has sshd and is not firewalled. Both have clone of the same repo, modified locally and differently on both hosts.

I need to two-way sync them by running commands on C (the firewalled one).

I need a script that does it, the "git-sync" script, running on C.
              git-sync  user@host:path  [local-dir]   # synchronize
local repo with
                                                                   #
remote repo via ssh
If there are no conflicts, I need to bring both repos to same state (even if
their history will be different). If there are conflicts, I need to
synchronize everything
that is not in conflict, and report the list of conflicted files, and leave
the remote version as  './file.SUFFIX'  on host C, where script was invoked.

Thanks Yakov

Jakub Narebski· Feb 1, 2007, 02:33 UTC · re: Yakov Lerner · lore

Re: two-way sync; from firewalled host

Yakov Lerner wrote:

Show 5 quoted lines

> I have two hosts, host C which is firewalled (no sshd),
> and host S which has sshd and is not firewalled. Both have
> clone of the same repo, modified locally and differently on both hosts.
> 
> I need to two-way sync them by running commands on C (the firewalled one).

You can on host C pull from host S, and on host C push to host S.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

Jakub Narebski· Feb 3, 2007, 09:14 UTC · re: Jakub Narebski · lore

Re: two-way sync; from firewalled host

[Cc: git@vger.kernel.org]

Jakub Narebski wrote:

Show 9 quoted lines

> Yakov Lerner wrote:
> 
>> I have two hosts, host C which is firewalled (no sshd),
>> and host S which has sshd and is not firewalled. Both have
>> clone of the same repo, modified locally and differently on both hosts.
>> 
>> I need to two-way sync them by running commands on C (the firewalled one).
> 
> You can on host C pull from host S, and on host C push to host S.

See post by Junio explaining how to setup this:
    
  Message-ID: <7vfy9ndiqp.fsf@assigned-by-dhcp.cox.net>
  http://permalink.gmane.org/gmane.comp.version-control.git/38549

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git