<br><br><div><span class="gmail_quote">2007/5/16, Bert Freudenberg <<a href="mailto:bert@freudenbergs.de">bert@freudenbergs.de</a>>:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
On May 17, 2007, at 0:18 , j blatter wrote:<br><br>> I mean: Let the programmer choose if it's needed or not. What's the<br>> problem with that? You can popup a dialog "Look gosh, I don't find<br>> the previous version, if do you really care you can abort the
<br>> operation. Want to abort?"<br><br>Huh? You're not making sense. If that version is needed there is no<br>choice, you only can abort. And that's what the friendly pink window<br>told you.<br><br>> If I'm merging or diffing or loading is not the point.
<br><br>I just pointed out the cases where you really need a specific<br>version. Like, a differential version is no full version, it *needs*<br>its base version to be loadable. No way around that. </blockquote><div><br>Ok, I was merging.
<br>Well, let me see if I've understood what you mean. You're saying that when I'm merging, the stuff what is going to be merged (do you call this "a differential version"?) isn't enough to perform the merging, so it *needs* the previous ancestor.
<br>If that's correct I ask then. Why don't just search for another common ancestor and notify/popup the choice to the programmer if that's the case?. I'm pretty sure the "really need specific version" (version 5 below) is mostly = to the previous one (version 4 below).
<br>So the workaround of this problem....recalling<br><br>Xxxx-in.6 <---- this is what you want to merge<br>Xxxx-in.4 <---- this is what you have now<br>Xxxx-in.3<br><br>(a.k.a. my stupid little brother deleted
Xxxx-in.5)<br>is to rename or copy manually Xxxx-in.4 to Xxxx-in.5?<br>How can one still merge if a intermediate version isn't there?<br><br>thanks<br></div><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Same for merging<br>- you need the last common ancestor to find out what changed in your<br>version vs. the version to be merged.<br><br>In other cases you should not see that error, if you did, its a bug.<br>So again - what did you actually try to do?
<br><br>- Bert -<br><br><br>> A source control tool should give the control to the programmer<br>> *not* to the program.<br>><br>> 2007/5/16, Bert Freudenberg < <a href="mailto:bert@freudenbergs.de">bert@freudenbergs.de
</a>>:<br>> On May 16, 2007, at 23:52 , j blatter wrote:<br>><br>> > Suppose you have a Monticello repository with<br>> ><br>> > Xxxx-in.6 <---- this is what you want to load<br>> > Xxxx-in.4
<---- this is what you have now loaded<br>> > Xxxx-in.3<br>> > ...<br>> ><br>> > Error: Could not find version ' Xxxx-in.5'. Maybe you need to add a<br>> > repository?<br>> >
<br>> > hey, not at all son.<br>> > What's the problem if I haven't the 5th ? That's not an Error, I<br>> > don't care for the 5th, it's lost, so it'd be a Notification don't<br>
> > you think so?<br>><br>> Depends on what you tried to do. For merging and diffing this version<br>> might actually be needed.<br>><br>> - Bert -<br>><br><br><br><br></blockquote></div><br>