Hallo Joachim, On December 1, 2010 02:10:49 pm J. Schneider wrote: > commit and push is two different things.
yes. it takes a little while to get used to it, but basically it is:
hg pull # get the latest public repository status
hg up # update your working directory to the latest status
... hack ... hack
hg ci # from time to time commit your work (think: backup)
... hack ... hack
hg ci # finsh your work with a last commit
hg pull # the public repo may have changed while you were hacking
hg up # update/merge changes from the public repo.
# hg up will complain if there are conflicts, e.g. if
# somebody else has already edited, committed and pushed
# a change that is conflicting with your changes
# a conflict resolution tool will be called up to let you
# decide whether to keep your changes, their, or mix/edit
# the two
hg push # now, and only now, your local changes are available to
# the world
usually, before doing hg push I check the status of my local repo with `hg
view` and/or `hg status`.
> For now I think I should get rid of the file, therefore I attach it
> here. I know, that's not the elegant way.
Thanks. That's OK. I merged it using [0]
> Somebody wrote about a way to attach files as patches on launchpad, but
> I can't find anything the like in the web interface, neither the e-mail
> on the list where it was explained.
I don't think I explained how to attach a file on Launchpad, sorry. Here it
is [1].
Yuv
[0] <http://wiki.panotools.org/Hugin_translation_guide#Developer_info>
[1]
<http://wiki.panotools.org/Hugin_translation_guide#Contribute_your_Translation>
signature.asc
Description: This is a digitally signed message part.
