Author xdegaye
Recipients barry, martin.panter, mdk, pitrou, twouters, vstinner, xdegaye
Date 2018-01-21.13:49:52
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1516542592.46.0.467229070634.issue32430@psf.upfronthosting.co.za>
In-reply-to
Content
A solution to this issue must deal with the following use case:

A developer has made changes to Modules/Setup and is tracking these changes in a VCS, for example with mercurial or with a git submodule through a symlink. By the time he is about to pull the commit that is fixing this issue from the Python repository, he is also experimenting with a new modification in Modules/Setup that he has not commited or staged yet in his own mercurial or git submodule repository or whatever.

IMO a solution to this issue that overwrites the current user changes when he is merging the corresponding commit is not acceptable.
History
Date User Action Args
2018-01-21 13:49:52xdegayesetrecipients: + xdegaye, twouters, barry, pitrou, vstinner, martin.panter, mdk
2018-01-21 13:49:52xdegayesetmessageid: <1516542592.46.0.467229070634.issue32430@psf.upfronthosting.co.za>
2018-01-21 13:49:52xdegayelinkissue32430 messages
2018-01-21 13:49:52xdegayecreate