William Uther [EMAIL PROTECTED] writes:
Hi,
I'm newish here, so my opinion might not count for much, but I
think this is one area where subversion got things right. I highly
recommend that people read about subversion's system before making up
their minds.
On Tue, Nov 21, 2006 at 01:18:35PM +1100, Brian May wrote:
Daniel == Daniel Lakeland [EMAIL PROTECTED] writes:
This is something to watch with Monotone, if two people create the
same branch at the same time... I thought you wanted me to create
it? No - I told you I was going to create it!
On Mon, Nov 20, 2006 at 06:34:04PM -0600, Timothy Brownawell wrote:
On Mon, 2006-11-20 at 15:06 -0800, Daniel Lakeland wrote:
On Mon, Nov 20, 2006 at 02:52:54PM -0800, wrote:
Apparently I'm in a situation where monotone can't merge two branches:
(on windows...)
now my
Bruce == Bruce Stephens [EMAIL PROTECTED] writes:
Bruce Sure, that may happen. That's just a bug, though, isn't
Bruce it, so you commit a revision containing the changes to that
Bruce one file (including attribute change) as a child of the
Bruce original, and merge it wherever
Markus Schiltknecht [EMAIL PROTECTED] writes:
[...]
In monotone, you would use propagation to achieve the very
same. Although, I'm unsure how cvs_import could handle that... maybe
it's doable by manually telling it how to resolve *that* conflict.
No, propagate would also copy all the other
Richard == Richard Levitte - VMS Whacker [EMAIL PROTECTED] writes:
Richard format on extraction. So if something was stored with
Richard mtn:eol = CR (on a Mac, typically), all CRs would be
I might be mistaken, but I believe this file format is obsolete as of
Mac OS X, now it is based
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On
Behalf Of
Bruce Stephens
Sent: Monday, November 20, 2006 4:44 PM
To: monotone-devel@nongnu.org
Subject: [Monotone-devel] Re: newbie: Life after cvs-import
Kelly F. Hickel [EMAIL PROTECTED] writes:
[...]
Larry Hastings [EMAIL PROTECTED] writes:
[...]
FWIW, I'm a Windows programmer, so I actually /use/ eol convention,
so if I might chime in with my opinion...
I agree with Nathaniel: eol conversion should be /disabled/ by
default, and should be /enabled/ with a setting.
hendrik == hendrik [EMAIL PROTECTED] writes:
hendrik In monotone, I suggest that a file that has been
hendrik character-converted on checkout have its line-end codingw
hendrik reverted on checkin, on a line-by-line basis. Thus only
hendrik when the user explicitly edits line
Hi,
I'm newish here, so my opinion might not count for much, but I
think this is one area where subversion got things right. I highly
recommend that people read about subversion's system before making up
their minds. http://svnbook.red-bean.com/nightly/en/
svn.advanced.props.html In
Graydon == Graydon Hoare [EMAIL PROTECTED] writes:
Graydon Woah! Did we really leave it like this? That's
Graydon terrible. We added an attribute to files called
Graydon mtn:manual_merge that controls whether the merger
Graydon believes it can do line-merging on the file or
Richard Levitte - VMS Whacker [EMAIL PROTECTED] writes:
[...]
Now, please, before you start reacting, I *know* that the whole file
isn't stored, only the delta. Unfortunately, I know diddly over
squat about xdelta, so a question is if storing different EOL
formats at different times creates
Apparently I'm in a situation where monotone can't merge two branches:
(on windows...)
mtn merge
mtn: 2 heads on branch ''
mtn: [left] 01565
mtn: [right] 74e29...
mtn: warning: rename target conflict: nodes 6, 1, both want parent 0, name
mtn: warning: resolve non-content conflicts and
hendrik == hendrik [EMAIL PROTECTED] writes:
hendrik Just for historical record, this famous Microsoft
hendrik incompatibility is actually a point in which they
hendrik followed the official standard. ASCII was designed
hendrik without a newline symbol; instead, it had a
Larry Hastings [EMAIL PROTECTED] writes:
[...]
I'm not sure what SVN using two separate values (one as a
mime-type!) buys them.
I believe the theory is that you could use different merging programs
for some types. text/xml is the usual example, where you might have
an XML tree-merging
Markus Schiltknecht wrote:
Wow! Where did you get those prices? And what source (ehm.. departing
airport) are you flying from?
Milano, most probably from Malpensa (MXP) airport.
I don't remember right now, but 95% of the foreign flights are from there.
Last I've checked it was 800 EUR for me
Nathaniel Smith wrote:
And, we need to pick a date. If you are at all interested, even a
little, in attending, then please go to the wiki page and use the
ingenious code posted there to indicate what dates are probably
possible for you!
Though I (think I) have the proper C++ skills I didn't
Kelly F. Hickel wrote:
Then you got
* stable
|\
| \
| * development
| |
| | continue to work on development
| .
| continue to work on stable
.
and at some later point
.
|
* .
\ |
\|
* can merge from stable into development
[Kelly F. Hickel] Well, this is an interesting idea. In
On Wed, Nov 22, 2006 at 10:13:08AM +1100, Brian May wrote:
hendrik == hendrik [EMAIL PROTECTED] writes:
hendrik In monotone, I suggest that a file that has been
hendrik character-converted on checkout have its line-end codingw
hendrik reverted on checkin, on a line-by-line
On Wed, Nov 22, 2006 at 10:05:13AM +1100, Brian May wrote:
hendrik == hendrik [EMAIL PROTECTED] writes:
hendrik Just for historical record, this famous Microsoft
hendrik incompatibility is actually a point in which they
hendrik followed the official standard. ASCII was
On Tue, Nov 21, 2006 at 02:04:07PM -0700, Shaun Jackman wrote:
It appears the BOOST_SP_DISABLE_THREADS is the source of monotone's
cross-platform issues on Debian. Namely, that monotone fails to run
(deadlock) on s390, hppa, sparc, mips, and mipsel, but runs fine on
i386, amd64, ia64, alpha
Having read the line endings with 0.31 thread and having used the
svn:eol-style property I have a vague feeling that line endings may be
better specified using some aspect of the (yet to be defined) project
policy stuff.
In an svn project that I work on, we generally set svn:eol-style to LF
On 11/21/06, Derek Scherger [EMAIL PROTECTED] wrote:
Having read the line endings with 0.31 thread and having used the
svn:eol-style property I have a vague feeling that line endings may be
better specified using some aspect of the (yet to be defined) project
policy stuff.
In an svn project
23 matches
Mail list logo
