From: "Steve Simon" <steve@quintile.net>
To: 9fans@9fans.net
Subject: Re: [9fans] fun with replica and pull
Date: Tue, 20 Dec 2011 09:17:23 +0000 [thread overview]
Message-ID: <eed418ae127edf90ffd1d654ac60051e@quintile.net> (raw)
In-Reply-To: <CAM6ozu73Hz5NaBBChnB61aw86cQL6jwTRYU0GGFbfg7W9jaC0Q@mail.gmail.com>
> pull -s *
This will not work. You need to pull each file that is marked
as modified, prefixed by the -s option to take the server (the labs)
version or -c to keep the version you have locally (and silence
the error).
It is the work of moments to load the debug printed by pull -v
into favorite plan9 editor, and modify it into a command line
to fetch the modified files.
-Steve
next prev parent reply other threads:[~2011-12-20 9:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-20 6:00 John Floren
2011-12-20 8:48 ` Peter A. Cejchan
2011-12-20 9:17 ` Steve Simon [this message]
2011-12-20 9:21 ` Peter A. Cejchan
2011-12-21 0:15 ` John Floren
[not found] <CAL4LZyg=ip2bLy=AiOyKYevDKKcERpCZXNhKWDUWB9i7unYmag@mail.gmail.c>
2011-12-20 13:23 ` erik quanstrom
2011-12-20 15:47 ` Yaroslav
2011-12-20 15:57 ` ron minnich
2011-12-20 16:09 ` Federico Benavento
2011-12-20 16:24 ` Jens Staal
2011-12-21 8:17 ` Peter A. Cejchan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eed418ae127edf90ffd1d654ac60051e@quintile.net \
--to=steve@quintile.net \
--cc=9fans@9fans.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).