Re: Coordinate work on the cvs webwml repository
Hi,
David Prévot <taffit@debian.org> wrote:
> Hi,
>
> Le 10/04/2012 10:39, Holger Wansing a écrit :
>
> > This is to avoid duplicate work - and throw away my work
> > because others did, what I intended to do
>
> “cvs up $files” will merge the changes already in the directory with yours.
> “cvs diff $files” will show what is to be committed.
> You can also save your files before, in order to compare them with the
> one from the repository (CVS isn't very kind in case of conflict).
>
> If you're referring to my */CD/faq/index.wml commit, it only was, as
> stated in the commit log:
> ./smart_change.pl -p \
> -s 's/\{Linux\|Hurd\}/{Linux|Hurd|kFreeBSD}/' \
> english/CD/faq/index.wml
> in order to fix your previous incomplete commit made more than three
> hours before. Please, do commit complete fixes if you don't want people
> to mess with what you're planning to fix several hours later.
I didn't plan to leave so much time between, but hey - real life
some times strikes back!
And I thought that would not be a problem, since I have coordinated that
work, I thought.
Holger
--
= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
Powered by Sylpheed 3.0.2 under
Debian GNU / / _ _ _ _ _ __ __
/ /__ / / / \// //_// \ \/ /
/____/ /_/ /_/\/ /___/ /_/\_\ 6.0 / Squeeze.
Registered LinuxUser #311290 - http://counter.li.org/
= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
Reply to: