Re: Problem with pack

From: Jakub Narebski <jnareb@gmail.com>
Date: Aug 25, 2006, 10:41 UTC
Message-ID: <ecmk3o$sbs$1@sea.gmane.org>
In-Reply-To: <44EECEDC.7090608@op5.se>

Andreas Ericsson wrote:

Show 22 quoted lines

>>> BTW I'd recommend not syncing with unison, but with the git 
>>> transports: If your PC and Laptop are connected, you could do 
>>> something like
>>>
>>>     git pull laptop:my_project/.git
>>>   
>> Actually, the project, including the git archive gets syncronized as a 
>> part of a syncronization process including all my Documents directory 
>> (the project is in fact a LaTeX manual with somehow complex LaTeX 
>> packages and classes). Syncronizing in this way actually worked very 
>> well so far, because at once I was getting in sync all my working trees 
>> and all my repos...
>> 
> 
> The largest benefit of using git's synchronization methods is that you 
> immediately get a pack-file verification, and also that you never risk 
> overwriting anything in either repo if you've forgotten to sync between 
> the two (say you've made changes on your laptop, forgot to send them to 
> your workstation, then made changes on your workstation and then you try 
> to sync them). It's possible to recover from such a situation using the 
> lost-found tool, but it can be cumbersome, and uncommitted changes, as 
> well as changes to the working tree, are lost forever.

Unison (which if I remember correctly uses rsync, or rsync over ssh) detect such case and ask user what to do if both sides changed a file (copy from one side, copy from second side, view diff, merge,...).

But you can always tell unison to ignore git object database
  ignore = Name .git
and perhaps also ignore working directories under git control
  ignore = Path path/to/working/dir/

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git