Mercurual doesn't see changes
Igor Kostenko
isanych at gmail.com
Fri Nov 14 16:18:16 UTC 2008
Hello all,
I've migrated old cvs project to hg (cvs2svn + hg convert) recently and
developers complain sometimes that hg don't see all changes so they should made
dummy changes or use touch utility in such cases (I'm using mercurial over a
year now, but mostly on Windows and didn't have such problems).
Now I have working copy with such problem and I don't know what to say (centos
5.2 python 2.4.3 hg 1.0.2):
#ll defs/GNUdefs/makefile.commondef
-rwxr-xr-x 1 root root 3082 Nov 13 10:24 defs/GNUdefs/makefile.commondef
# hg tip
changeset: 2923:d656d9a1a1bc
tag: tip
user: root at root
date: Fri Nov 14 18:30:20 2008 +0300
summary: commit
# hg --debug diff -g defs/GNUdefs/makefile.commondef
# chmod 0666 defs/GNUdefs/makefile.commondef
# hg --debug diff -g defs/GNUdefs/makefile.commondef
searching for copies back to rev 2924
diff --git a/defs/GNUdefs/makefile.commondef b/defs/GNUdefs/makefile.commondef
old mode 100755
new mode 100644
--- a/defs/GNUdefs/makefile.commondef
+++ b/defs/GNUdefs/makefile.commondef
@@ -9,8 +9,10 @@
# from a file, which includes this one
#linux selector:
-CCC = g++
+#CCC = g++
+VENDORS_DEFINITIONS_FILE ?= $(TOP_DIR)/defs/GNUdefs/makefile.vendors
+include $(VENDORS_DEFINITIONS_FILE)
include $(TOP_DIR)/defs/GNUdefs/makefile.ace
#include $(TOP_DIR)/defs/GNUdefs/makefile.rw
include $(TOP_DIR)/defs/GNUdefs/makefile.sockets
@@ -31,7 +33,7 @@
DEF_DEFS = $(BUILD_DEFS) $(LOCAL_DEFS) $(ECS_DEFS) $(ROGUE_DEFS)
$(ACE_DEFS) $(THREADS_DEFS)
-DEF_C_FLAGS = -g -I/usr/include $(BUILD_C_FLAGS) $(LOCAL_C_FLAGS)
$(THREADS_C_FLAGS)
+DEF_C_FLAGS = -g -I$(PLATFORM_INCL_DIRS) $(BUILD_C_FLAGS) $(LOCAL_C_FLAGS)
$(THREADS_C_FLAGS)
DEF_CC_FLAGS = -g -w $(BUILD_CC_FLAGS) $(LOCAL_CC_FLAGS) $(THREADS_CC_FLAGS)
#DEF_CC_FLAGS = -g -W -Wall $(BUILD_CC_FLAGS) $(LOCAL_CC_FLAGS)
$(THREADS_CC_FLAGS)
DEF_LD_FLAGS = $(BUILD_LD_FLAGS) $(LOCAL_LD_FLAGS) $(THREADS_LD_FLAGS)
# chmod 0777 defs/GNUdefs/makefile.commondef
# hg --debug diff -g defs/GNUdefs/makefile.commondef
and again nothing. After touch diff (and status and commit) see changes with
any file mode.
When I create test repository with this file and the same change everything
work correctly.
Does anyone have any idea how it's happened?
Is there any way to make sure that I committed all changes?
WBR, Igor
More information about the Mercurial
mailing list