Roundup Robot devn...@psf.upfronthosting.co.za added the comment:
New changeset 4d351135f128 by Éric Araujo in branch '3.2':
Make VCSes ignore the compiled shared library file (#12255)
http://hg.python.org/cpython/rev/4d351135f128
New changeset bdad5bc9a2ed by Éric Araujo in branch '3.2':
Stop
Roundup Robot devn...@psf.upfronthosting.co.za added the comment:
New changeset 9356d2d61e9f by Éric Araujo in branch '2.7':
Make VCSes ignore the compiled shared library file (#12255)
http://hg.python.org/cpython/rev/9356d2d61e9f
New changeset 4e5127874adf by Éric Araujo in branch '2.7':
Stop
Éric Araujo mer...@netwok.org added the comment:
This is also fixed in 3.3, but I missed a reference in the merge commit message.
--
resolution: - fixed
stage: commit review - committed/rejected
status: open - closed
___
Python tracker
Senthil Kumaran sent...@uthcode.com added the comment:
On Sat, Jun 25, 2011 at 08:38:04PM +, Senthil Kumaran wrote:
As I am not affected by remains of .rej and .orig (neither have I
found their usefulness (yet)), so my concerns can be stepped over.
Just a side-note. I wondered why is
Senthil Kumaran sent...@uthcode.com added the comment:
Eric, sure go ahead. As I am not affected by remains of .rej and .orig (neither
have I found their usefulness (yet)), so my concerns can be stepped over. Plus,
I have found a way to ignore files via patterns in .hgrc.
I already see you
Éric Araujo mer...@netwok.org added the comment:
Your experiments with .hgignore and your thoughts about server vs. clone
.hgignore give me the impression of a misunderstanding of how it works.
To clarify: The repo .hgignore file is a repo-specific listing of patterns to
ignore. As such, it
Senthil Kumaran sent...@uthcode.com added the comment:
+libpython*.so* is fine, but please don't remove the rej and orig. By
convention and practice, those files are meant to be in .ignore files to
prevent accidental checkins. Usually when the conflict occurs you are notified
immediately
R. David Murray rdmur...@bitdance.com added the comment:
As I've said before, I would vote to not have .rej and .orig in .hgignore. You
can always add them to your personal .hgignore, but I know of no way to tell
mercurial I *don't* want to ignore these files that are in the repo
.hgignore.
Éric Araujo mer...@netwok.org added the comment:
By convention and practice, those files are meant to be in .ignore
files to prevent accidental checkins.
Maybe with other tools. Mercurial will tell you what new files are to be added
in the next commit once to four times, depending on your
Senthil Kumaran sent...@uthcode.com added the comment:
I strictly have not faced any problem with those rej and orig files being
present in the .hgignore. I also thought keeping the .hgignore in the repo was
for distribution and never knew that it can affect local views (If you remove
.rej
R. David Murray rdmur...@bitdance.com added the comment:
I have no idea what you mean by for distrabution in this context. The
.hgignore in the checkout causes hg to ignore the files/patterns listed in it
when any hg commands are run against that checkout. And no I can't remove it
in my
Senthil Kumaran sent...@uthcode.com added the comment:
By for distribution, I meant that everyone who checks out ( clones)
from hg.cpython.org repository share the same .hgignore file, instead
of each person having to create their own file.
I got an impression from the earlier message that hg
R. David Murray rdmur...@bitdance.com added the comment:
Well, since there's no central server for hg, it can't track based on the
server. Perhaps I confused you by saying that the .hgignore file was in the
repo. (It is in the repo in the sense that any tracked file is in the repo,
but it's
Éric Araujo mer...@netwok.org added the comment:
I would also propose to remove *.rej and *.orig from the ignore files. It’s
helpful to see them in hg status in case you had a difficult merge and did not
fix all files. My usage is that I remove *.rej and *.orig after I’m done
merging (or
14 matches
Mail list logo
