Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > comp.lang.python > #4130
| Path | csiph.com!x330-a1.tempe.blueboxinc.net!usenet.pasdenom.info!aioe.org!feeder.news-service.com!newsfeed.xs4all.nl!newsfeed6.news.xs4all.nl!xs4all!post.news.xs4all.nl!not-for-mail |
|---|---|
| Return-Path | <prvs=091849e4b=jeanmichel@sequans.com> |
| X-Original-To | python-list@python.org |
| Delivered-To | python-list@mail.python.org |
| X-Spam-Status | OK 0.018 |
| X-Spam-Evidence | '*H*': 0.96; '*S*': 0.00; 'decent': 0.07; 'merging': 0.09; 'subject:tools': 0.09; 'wrote:': 0.14; 'i.e': 0.16; 'really?': 0.16; 'received:192.168.200': 0.16; 'writes:': 0.20; 'cc:no real name:2**0': 0.20; 'cc:2**0': 0.20; 'header:In-Reply- To:1': 0.22; 'cc:addr:python-list': 0.22; 'issue.': 0.22; 'conflicts': 0.23; 'changes': 0.29; 'forgot': 0.29; 'cc:addr:python.org': 0.31; 'edited': 0.31; 'separately': 0.31; 'solved': 0.31; 'received:192': 0.34; 'there': 0.35; 'header:User- Agent:1': 0.35; 'doing': 0.36; 'received:192.168': 0.37; 'resulting': 0.38; 'user': 0.38; 'computer.': 0.38; 'files': 0.38; 'would': 0.40; 'computers': 0.64; 'subject:Development': 0.73; 'occasion': 0.84 |
| X-IronPort-AV | E=Sophos;i="4.64,274,1301868000"; d="scan'208";a="1395275" |
| X-Virus-Scanned | amavisd-new at zimbra.sequans.com |
| Date | Wed, 27 Apr 2011 14:24:30 +0200 |
| From | Jean-Michel Pichavant <jeanmichel@sequans.com> |
| User-Agent | Mozilla-Thunderbird 2.0.0.24 (X11/20100328) |
| MIME-Version | 1.0 |
| To | Anssi Saari <as@sci.fi> |
| Subject | Re: Development tools and practices for Pythonistas |
| References | <58a6bb1b-a98e-4c4a-86ea-09e040cb2d21@r35g2000prj.googlegroups.com> <mailman.869.1303848895.9059.python-list@python.org> <877hagoa0u.fsf@benfinney.id.au> <mailman.890.1303896280.9059.python-list@python.org> <vg37hafevto.fsf@pepper.modeemi.fi> |
| In-Reply-To | <vg37hafevto.fsf@pepper.modeemi.fi> |
| Content-Type | text/plain; charset=ISO-8859-1; format=flowed |
| Content-Transfer-Encoding | 7bit |
| Cc | python-list@python.org |
| X-BeenThere | python-list@python.org |
| X-Mailman-Version | 2.1.12 |
| Precedence | list |
| List-Id | General discussion list for the Python programming language <python-list.python.org> |
| List-Unsubscribe | <http://mail.python.org/mailman/options/python-list>, <mailto:python-list-request@python.org?subject=unsubscribe> |
| List-Archive | <http://mail.python.org/pipermail/python-list> |
| List-Post | <mailto:python-list@python.org> |
| List-Help | <mailto:python-list-request@python.org?subject=help> |
| List-Subscribe | <http://mail.python.org/mailman/listinfo/python-list>, <mailto:python-list-request@python.org?subject=subscribe> |
| Newsgroups | comp.lang.python |
| Message-ID | <mailman.893.1303907075.9059.python-list@python.org> (permalink) |
| Lines | 17 |
| NNTP-Posting-Host | 82.94.164.166 |
| X-Trace | 1303907075 news.xs4all.nl 32470 [::ffff:82.94.164.166]:39770 |
| X-Complaints-To | abuse@xs4all.nl |
| Xref | x330-a1.tempe.blueboxinc.net comp.lang.python:4130 |
Show key headers only | View raw
Anssi Saari wrote: > Jean-Michel Pichavant <jeanmichel@sequans.com> writes: > > >> For a single user, there would be no merge issue. >> > > Really? What about a single user with many computers and environments? > I find myself merging files on occasion because I edited them > separately and forgot to check in changes before doing more edits on a > different computer. > I was talking about merge *issue* i.e merge resulting in conflicts that are not easy to solve. With a single user most of the merge will be solved automatically by any decent VCS. JM
Back to comp.lang.python | Previous | Next — Previous in thread | Next in thread | Find similar
Development tools and practices for Pythonistas snorble <snorble@hotmail.com> - 2011-04-26 07:39 -0700
Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-04-26 09:00 -0700
Re: Development tools and practices for Pythonistas "Martin P. Hellwig" <martin.hellwig@gmail.com> - 2011-04-26 17:02 +0000
Re: Development tools and practices for Pythonistas Thomas Rachel <nutznetz-0c1b6768-bfa9-48d5-a470-7603bd3aa915@spamschutz.glglgl.de> - 2011-04-26 19:59 +0200
Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-04-27 04:42 +1000
Re: Development tools and practices for Pythonistas Thomas Rachel <nutznetz-0c1b6768-bfa9-48d5-a470-7603bd3aa915@spamschutz.glglgl.de> - 2011-04-27 00:32 +0200
Re: [OT] Comparing VCS tools (was ""Development tools and practices for Pythonistas") Tim Chase <python.list@tim.thechases.com> - 2011-04-26 20:44 -0500
Re: [OT] Comparing VCS tools Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 12:45 +1000
Re: [OT] Comparing VCS tools Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 16:51 +1000
Re: [OT] Comparing VCS tools Tim Chase <python.list@tim.thechases.com> - 2011-04-27 14:13 -0500
Re: Comparing VCS tools (was ""Development tools and practices for Pythonistas") rusi <rustompmody@gmail.com> - 2011-04-26 19:50 -0700
Re: Comparing VCS tools (was ""Development tools and practices for Pythonistas") alex23 <wuwei23@gmail.com> - 2011-04-26 22:37 -0700
Re: [OT] Comparing VCS tools (was ""Development tools and practices for Pythonistas") Kevin Walzer <kw@codebykevin.com> - 2011-04-29 09:26 -0400
Re: [OT] Comparing VCS tools (was ""Development tools and practices for Pythonistas") Daniel Kluev <dan.kluev@gmail.com> - 2011-04-30 05:08 +1100
Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-26 20:04 +0200
Re: Development tools and practices for Pythonistas CM <cmpython@gmail.com> - 2011-04-26 11:29 -0700
Re: Development tools and practices for Pythonistas CM <cmpython@gmail.com> - 2011-04-26 11:31 -0700
Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-04-27 04:50 +1000
Re: Development tools and practices for Pythonistas Chris Angelico <rosuav@gmail.com> - 2011-04-27 06:14 +1000
Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 09:41 +1000
Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-04-27 10:44 +1000
Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-27 11:24 +0200
Re: Development tools and practices for Pythonistas Anssi Saari <as@sci.fi> - 2011-04-27 15:13 +0300
Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-27 14:24 +0200
Re: Development tools and practices for Pythonistas Hans Georg Schaathun <hg@schaathun.net> - 2011-04-30 08:37 +0100
Re: Development tools and practices for Pythonistas Martin Schöön <martin.schoon@gmail.com> - 2011-04-30 09:15 +0000
Re: [OT] VCS for non-text (was Development tools and practices for Pythonistas) Tim Chase <python.list@tim.thechases.com> - 2011-04-30 09:18 -0500
Re: [OT] VCS for non-text (was Development tools and practices for Pythonistas) Martin Schöön <martin.schoon@gmail.com> - 2011-05-01 19:53 +0000
Re: Development tools and practices for Pythonistas Hans Georg Schaathun <hg@schaathun.net> - 2011-04-29 19:35 +0100
Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-30 09:17 +1000
Re: Development tools and practices for Pythonistas CM <cmpython@gmail.com> - 2011-04-29 20:21 -0700
Re: Development tools and practices for Pythonistas Roy Smith <roy@panix.com> - 2011-04-29 23:54 -0400
Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-05-01 10:36 +1000
Re: Development tools and practices for Pythonistas Shawn Milochik <shawn@milochik.com> - 2011-04-30 20:47 -0400
Re: Development tools and practices for Pythonistas Dietmar Schwertberger <news@schwertberger.de> - 2011-05-01 18:11 +0200
Re: Development tools and practices for Pythonistas Jason Earl <jearl@notengoamigos.org> - 2011-05-01 14:51 -0600
Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-05-02 07:49 +1000
Re: Development tools and practices for Pythonistas Paul Rubin <no.email@nospam.invalid> - 2011-05-01 19:37 -0700
Re: Development tools and practices for Pythonistas David Boddie <david@boddie.org.uk> - 2011-05-02 01:33 +0200
Re: Development tools and practices for Pythonistas Dietmar Schwertberger <news@schwertberger.de> - 2011-05-02 19:40 +0200
Re: Development tools and practices for Pythonistas Shawn Milochik <shawn@milochik.com> - 2011-04-29 23:49 -0400
Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-01 20:06 -0700
Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-05-02 13:22 +1000
Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-01 20:45 -0700
Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-05-02 17:08 +1000
Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-02 00:19 -0700
Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-05-02 17:48 +1000
Re: Development tools and practices for Pythonistas jacek2v <jacek2v@gmail.com> - 2011-05-02 02:09 -0700
Re: Development tools and practices for Pythonistas Algis Kabaila <akabaila@pcug.org.au> - 2011-05-02 20:38 +1000
Re: Development tools and practices for Pythonistas jacek2v <jacek2v@gmail.com> - 2011-05-03 11:31 -0700
Re: Development tools and practices for Pythonistas Anssi Saari <as@sci.fi> - 2011-05-03 21:19 +0300
Re: Development tools and practices for Pythonistas rusi <rustompmody@gmail.com> - 2011-05-03 11:50 -0700
Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-27 22:14 +1000
Re: Development tools and practices for Pythonistas Chris Angelico <rosuav@gmail.com> - 2011-04-27 19:33 +1000
Re: Development tools and practices for Pythonistas Jean-Michel Pichavant <jeanmichel@sequans.com> - 2011-04-27 13:17 +0200
Re: Development tools and practices for Pythonistas Thomas Rachel <nutznetz-0c1b6768-bfa9-48d5-a470-7603bd3aa915@spamschutz.glglgl.de> - 2011-04-27 20:08 +0200
Re: Development tools and practices for Pythonistas Ben Finney <ben+python@benfinney.id.au> - 2011-04-28 09:44 +1000
Re: [OT] VCS tools (was "Development tools and practices for Pythonistas") Tim Chase <python.list@tim.thechases.com> - 2011-04-27 14:07 -0500
Re: [OT] VCS tools (was "Development tools and practices for Pythonistas") Martin Schöön <martin.schoon@gmail.com> - 2011-04-28 20:48 +0000
Re: [OT] VCS tools Ben Finney <ben+python@benfinney.id.au> - 2011-04-29 07:50 +1000
Re: [OT] VCS tools Tim Chase <python.list@tim.thechases.com> - 2011-04-28 18:09 -0500
Re: [OT] VCS tools Daniel Kluev <dan.kluev@gmail.com> - 2011-04-29 11:37 +1100
Re: [OT] From svn to something else? (was: VCS tools) Hans Georg Schaathun <georg@schaathun.net> - 2011-04-29 11:07 +0100
Re: [OT] From svn to something else? Tim Chase <python.list@tim.thechases.com> - 2011-04-29 06:50 -0500
Re: [OT] From svn to something else? Hans Georg Schaathun <hg@schaathun.net> - 2011-04-29 18:01 +0100
Re: [OT] From svn to something else? Tim Chase <python.list@tim.thechases.com> - 2011-04-29 13:23 -0500
Re: [OT] From svn to something else? Ben Finney <ben+python@benfinney.id.au> - 2011-04-29 22:53 +1000
Re: [OT] From svn to something else? "D'Arcy J.M. Cain" <darcy@druid.net> - 2011-04-29 09:26 -0400
Re: [OT] VCS tools Martin Schöön <martin.schoon@gmail.com> - 2011-04-29 18:46 +0000
Re: Development tools and practices for Pythonistas Dan Stromberg <drsalists@gmail.com> - 2011-04-26 14:00 -0700
recommended Emacs mode (was Re: Development tools and practices for Pythonistas) Gour-Gadadhara Dasa <gour@atmarama.net> - 2011-04-27 08:39 +0200
Re: recommended Emacs mode (was Re: Development tools and practices for Pythonistas) rusi <rustompmody@gmail.com> - 2011-04-27 00:51 -0700
Re: recommended Emacs mode Gour-Gadadhara Dasa <gour@atmarama.net> - 2011-04-27 10:10 +0200
csiph-web