* two-way sync; from firewalled host
@ 2007-01-25 11:31 Yakov Lerner
2007-02-01 2:33 ` Jakub Narebski
0 siblings, 1 reply; 3+ messages in thread
From: Yakov Lerner @ 2007-01-25 11:31 UTC (permalink / raw)
To: Git Mailing List
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: two-way sync; from firewalled host 2007-01-25 11:31 two-way sync; from firewalled host Yakov Lerner @ 2007-02-01 2:33 ` Jakub Narebski 2007-02-03 9:14 ` Jakub Narebski 0 siblings, 1 reply; 3+ messages in thread From: Jakub Narebski @ 2007-02-01 2:33 UTC (permalink / raw) To: git 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. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: two-way sync; from firewalled host 2007-02-01 2:33 ` Jakub Narebski @ 2007-02-03 9:14 ` Jakub Narebski 0 siblings, 0 replies; 3+ messages in thread From: Jakub Narebski @ 2007-02-03 9:14 UTC (permalink / raw) To: git [Cc: git@vger.kernel.org] Jakub Narebski wrote: > 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-02-03 9:14 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-01-25 11:31 two-way sync; from firewalled host Yakov Lerner 2007-02-01 2:33 ` Jakub Narebski 2007-02-03 9:14 ` Jakub Narebski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).