<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD> <META http-equiv=Content-Type content="text/html; charset=us-ascii"> <META content="MSHTML 6.00.2900.3243" name=GENERATOR></HEAD> <BODY> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008>Following on from the mail below, I note that my point 4 is already in bzr 1.2 as merge --preview (I'm pleased!). Also with the dev release of bzr 1.2 I notice that "bzr missing" now does give a non-zero status if there are missing revisions.</SPAN></FONT></DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008></SPAN></FONT> </DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008>I have encountered a new problem which is demonstrated by the attached script. If the commented-out lines are un-commented then the script runs correctly. See the logs fail.log and success.log.</SPAN></FONT></DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008></SPAN></FONT> </DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008>The reason for the failure is that a merge of a new file into an empty repository does not work correctly. The successful version works because the repository "one" already has a file in it when the merge and commit is attempted.</SPAN></FONT></DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008></SPAN></FONT> </DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008>I should add that overall I am very pleased with bazaar-NG. The main area where I miss functionality, especially when compared with SVN is in the area of visual tools for viewing history. A bazaar version of kdesvn would be wonderful!</SPAN></FONT></DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008></SPAN></FONT> </DIV> <DIV dir=ltr align=left><FONT face=Arial color=#0000ff size=2><SPAN class=759111108-23012008>Thanks,</SPAN></FONT></DIV> <DIV> </DIV> <DIV align=left> <DIV align=left><FONT size=2><FONT face=Arial><STRONG><FONT color=#00001b>David</FONT></STRONG></FONT></FONT><BR></DIV></DIV> <DIV class=OutlookMessageHeader lang=en-us dir=ltr align=left> <HR tabIndex=-1> <FONT face=Tahoma size=2><B>From:</B> Ingamells, David <BR><B>Sent:</B> 17 January 2008 15:06<BR><B>To:</B> 'bazaar@lists.canonical.com'<BR><B>Subject:</B> Issues with bazaar 1.1<BR></FONT><BR></DIV> <DIV></DIV> <DIV><FONT face=Arial size=2><FONT size=2> <P>I have recently started using bazaar on a Ubuntu Gutsy platform and have encountered some problems:</P> <P></P> <P>1) I am using the Ubuntu Synaptic package manager in the way advised in the bzr installation instructions for Ubuntu. I am not allowed to install bzr-gtk (the latest available is 0.90) with bzr 1.x. It complains that bzr-gtk requires bzr < 0.91~.</P> <P></P> <P>2) I have the following issues with bzr 1.1.</P> <P>I am trying to write some tooling that uses the bzr command to manage a task (aka change set) based system based on bzr's revisions with a central "master" repository. Before allowing a user to perform a commit with this tooling I want to do some quality checks to ensure that the update builds with the latest updates from other developers that have been already merged into the master repository. To do this I need to run some bzr command that gives back a status to my script about missing revisions and merge conflicts. I have been trying several commands and find the following:</P> <P></P> <P>a) "bzr missing --quiet" is not quiet. It always prints a message even with no missing revisions</P> <P></P> <P>b) The returning of a useful completion status is patchy with many commands:</P> <P>diff gives back a non-zero status if there are differences; this is well </P> <P>documented in the reference manual - GOOD</P> <P>missing does not give back a status - when compared with what diff does it </P> <P>should give a non-zero status if there are missing revisions </P> <P>(the number of revisions missing?) - NOT GOOD</P> <P>resolve returns 1 if there are still conflicts - GOOD</P> <P>status no non-zero status even if differences (compare this with diff) - NOT GOOD</P> <P>merge -force returns a non-zero status if there are conflicts - GOOD</P> <P>pull returns 0 status even if there are merge conflicts. - NOT GOOD</P> <P>conflicts does not return a non-zero status when there are conflicts - NOT GOOD</P> <P>The documentation is very scant about saying when and what return statuses are used.</P> <P>3)I can find no informational command like bzr missing or bzr conflicts that does not do anything to the branch (bzr conflicts makes x.BASE x.OTHER x.THIS files) except report the conflicts or missing revisions AND return a status indicating that these do or do not exist. This could easily be added as an option (e.g. --count) to avoid upsetting the purists who say that a return status of non-zero indicates an error and must not be used for anything else. But then bzr diff already does return just the kind of status that I hoped the other commands would.</P> <P>4) It would be wonderful to see the dry-run option released for bzr merge that just shows what it would do to each file as has been discussed at some length in the bazaar mailing list by Aaron Bentley and others.</P> <P> </P> <P>David</P></FONT></FONT></DIV></BODY></HTML>