Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://mail.python.org/pipermail/python-dev/2009-January/085700.html below:

[Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch

• Previous message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
• Next message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

> svn up
> svnmerge
> ... conflicts
> svn revert -R .
> svn up
> svnmerge
> ... same conflicts

Ah. In the 3.0 branch, always do "svn revert ." after svnmerge.
It's ok (Nick says it isn't exactly ok, but I don't understand why)

Martin

• Previous message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
• Next message: [Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4