change refuses to close

"Aryeh M. Friedman" <[email protected]>
Newsgroups gmane.comp.version-control.aegis.user
Message-ID <[email protected]>
Aede says that a diff is not complete when in fact it is:

~/master.1.C043 aryeh@kirk% aegis -b && aegis -diff && aegis -de
aegis: Warning: You are seeing the short form of the error messages.  The
    message catalogues may not have been installed correctly, or you may
    need to check the settings of your LC_ALL and LANG environment
    variables.
aegis: cook -s -b 
/home/aegis/master/branch.1/baseline/src/build/cook/Howto.cook -nl? 
project=master.1
    change=43 version=1.C043 
search_path=/home/aryeh/master.1.C043:/home/aegis/master/branch.1/baseline:/
    home/aegis/master/baseline
Compiling obj/test/backend/util/net/http/TestHttpHeader.class
Compiling obj/test/backend/util/net/TestSocketWrapper.class
signedOn all built
aegis: Warning: You are seeing the short form of the error messages.  The
    message catalogues may not have been installed correctly, or you may
    need to check the settings of your LC_ALL and LANG environment
    variables.
aegis: project "master.1": change 43: 
src/backend/abstracts/AbstractsException.java,D not found
aegis: project "master.1": change 43: diff required
aegis: project "master.1": change 43: develop end fail
~/master.1.C043 aryeh@kirk% touch 
src/backend/abstracts/AbstractsException.java,D
~/master.1.C043 aryeh@kirk% !ae
aegis -b && aegis -diff && aegis -de
aegis: Warning: You are seeing the short form of the error messages.  The
    message catalogues may not have been installed correctly, or you may
    need to check the settings of your LC_ALL and LANG environment
    variables.
aegis: cook -s -b 
/home/aegis/master/branch.1/baseline/src/build/cook/Howto.cook -nl? 
project=master.1
    change=43 version=1.C043 
search_path=/home/aryeh/master.1.C043:/home/aegis/master/branch.1/baseline:/
    home/aegis/master/baseline
Compiling obj/test/backend/util/net/http/TestHttpHeader.class
Compiling obj/test/backend/util/net/TestSocketWrapper.class
signedOn all built
aegis: Warning: You are seeing the short form of the error messages.  The
    message catalogues may not have been installed correctly, or you may
    need to check the settings of your LC_ALL and LANG environment
    variables.
aegis: project "master.1": change 43: 
src/backend/abstracts/AbstractsException.java,D changed after diff
aegis: project "master.1": change 43: develop end fail
~/master.1.C043 aryeh@kirk% aelcf
src/backend/abstracts/AbstractsException.java
src/backend/abstracts/AbstractsNullException.java
src/backend/abstracts/Nulls.java
src/backend/adt/coord/CoordinatedCollection.java
src/backend/adt/graph/Edge.java
src/backend/adt/graph/GraphNode.java
src/backend/adt/graph/GraphNodeEdgeSet.java
src/backend/adt/graph/weight/WeightWrapperDirected.java
src/backend/adt/graph/weight/WeightWrapperField.java
src/backend/adt/graph/weight/WeightWrapperUndirected.java
src/backend/adt/tree/SimpleTreeNode.java
src/backend/adt/tree/SimpleTreeWalkNode.java
src/backend/adt/tree/SingleTypeTreeNode.java
src/backend/adt/tree/TreeNodeFinder.java
src/backend/adt/util/Pair.java
src/backend/adt/vlist/ValidatedList.java
src/backend/apps/admin/Developer.java
src/backend/apps/admin/Host.java
src/backend/apps/content/PageData.java
src/backend/apps/editor/Widget.java
src/backend/apps/social/Contact.java
src/backend/apps/social/ContactList.java
src/backend/apps/social/messaging/MessageTreeNode.java
src/backend/are/enforce/dv/DefaultValuedRuleEnforcer.java
src/backend/are/rule/decomp/IterableRuleView.java
src/backend/are/rule/unit/atom/AtomicRuleSpecifier.java
src/backend/are/rule/unit/atom/DiscreteTotalOrderWrapperIterator.java
src/backend/are/rule/unit/atom/LimitValueView.java
src/backend/langs/json/JSONSimpleElement.java
src/backend/langs/xml/XMLAttribute.java
src/backend/langs/xml/parse/StartTagToken.java
src/backend/util/UtilException.java
src/backend/util/state/MappedFiniteStateMapLink.java
src/backend/util/state/PairMappedFiniteStateMapLink.java
src/backend/util/state/PairedStateTransitionMap.java
src/backend/util/state/StateTransitionMap.java
src/backend/util/state/TransitionMap.java
src/lang/parse/Token.java
src/test/backend/TestAll.java
src/test/backend/abstracts/TestAll.java
src/test/backend/abstracts/TestNulls.java
src/test/backend/util/TestAll.java
test/00/t0004a.sh
testresults
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.