[Cialug] git in structured environment

[Lathrop Preston]

I am sorry. I did not realize that I as being unclear in my comments.

To me a working copy is always checked out/updated from the repository, not
from multiple other locations

in other words
each user will perform commits to the repository as is normal. resolving any
conflicts that might arise at that time.
on the backup server there is a job that grabs the most recent revision of
any updated files right before the backup is performed

Some of this might be a difference in how git works compared to how other
source control systems (ie CVS, SVN, SourceSafe [shudder])
as I said in my first post I might have been missing something specific to
the situation.

Laith
(not feeling very pedantic)

On Wed, Jul 9, 2008 at 4:07 PM, Colin Burnett <cmlburnett at gmail.com> wrote:

> On Wed, Jul 9, 2008 at 3:44 PM, Lathrop Preston <lathrop at prestonfam.org>
> wrote:
> > umm... no...
> >
> > if you are doing the git equiv of an 'svn update' to the working copy all
> > you will be doing is getting the most current code from the repository.
> >
> > Think of it as an anonymous read-only checkout.
>
> Could you be more pedantic in your scenario?
>
> You originally suggested to crontab to a "working copy under backup".
> To me that means my workstation is periodically executing `git push
> myserver` where myserver is a remote repo setup in .git/config.  If
> this is the case you have in mind then if a change I made creates an
> unresolvable conflict (e.g., modification of the exact same line) then
> my cron'ed `git push` cannot resolve my conflict and my pushes fail.
>
> The only other way I can interpret your comment is that my server has
> a crontab to `git pull` from all the workstations.  Again, the git
> pull could hit an unresolvable conflict and the pulls fail.
>
>
> Colin
> _______________________________________________
> Cialug mailing list
> Cialug at cialug.org
> http://cialug.org/mailman/listinfo/cialug
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://cialug.org/pipermail/cialug/attachments/20080709/a6819b63/attachment.htm