Am 05.11.2013 00:43, schrieb Terry Reedy: > On 11/4/2013 5:15 PM, Nick Coghlan wrote: > >> - I actually have "--no-commit" configured as a standard option for hg >> import in my .hgrc file so I never forget > > On Windows, hg uses .ini files. Do you have any idea what the > [section] > option = value > would look like? There is gui dialog for managing the .ini files, but it > does not have a page for import options.
It'll look like this: [defaults] import = --no-commit >> - "hg pull --rebase" avoids having a merge in the history for push races >> that involve only default branch changes > > Can this be done routinely for all pulls? Does it hurt if here are > working directory changes in 2 or 3 branches? It won't work with merge commits, so if you locally commit to 3.3 and merge to default, pull --rebase will error out if there are remote changes. cheers, Georg _______________________________________________ Python-Dev mailing list Python-Dev@python.org https://mail.python.org/mailman/listinfo/python-dev Unsubscribe: https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
