Google Git
Sign in
googlers / jrn / git / 538778469ca267c8888bc659d20680c3a1e077fd
commit538778469ca267c8888bc659d20680c3a1e077fd[log] [tgz]
authorFrank Lichtenheld <frank@lichtenheld.de>Tue Mar 06 10:42:24 2007 +0100
committerJunio C Hamano <junkio@cox.net>Sun Mar 11 22:49:08 2007 -0700
treee1ee911b54b5e22ec508e58f433317d1d53ae735
parented8ad7e2e29d4adf342964f6cc15d6b84f62c700 [diff]
cvsserver: Use Merged response instead of Update-existing for merged files

Using Update-existing leads to the client forgetting about the "locally
modified" status of the file which can lead to loss of local changes on
later updates.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Acked-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: e1ee911b54b5e22ec508e58f433317d1d53ae735
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitweb/
  7. mozilla-sha1/
  8. perl/
  9. ppc/
  10. t/
  11. templates/
  12. xdiff/
  13. RelNotes ⇨ Documentation/RelNotes-1.5.1.txt
  14. .gitignore
  15. .mailmap
  16. alloc.c
  17. archive-tar.c
  18. archive-zip.c
  19. archive.h
  20. base85.c
  21. blob.c
  22. blob.h
  23. builtin-add.c
  24. builtin-annotate.c
  25. builtin-apply.c
  26. builtin-archive.c
  27. builtin-blame.c
  28. builtin-branch.c
  29. builtin-bundle.c
  30. builtin-cat-file.c
  31. builtin-check-ref-format.c
  32. builtin-checkout-index.c
  33. builtin-commit-tree.c
  34. builtin-config.c
  35. builtin-count-objects.c
  36. builtin-describe.c
  37. builtin-diff-files.c
  38. builtin-diff-index.c
  39. builtin-diff-tree.c
  40. builtin-diff.c
  41. builtin-fmt-merge-msg.c
  42. builtin-for-each-ref.c
  43. builtin-fsck.c
  44. builtin-grep.c
  45. builtin-init-db.c
  46. builtin-log.c
  47. builtin-ls-files.c
  48. builtin-ls-tree.c
  49. builtin-mailinfo.c
  50. builtin-mailsplit.c
  51. builtin-merge-base.c
  52. builtin-merge-file.c
  53. builtin-mv.c
  54. builtin-name-rev.c
  55. builtin-pack-objects.c
  56. builtin-pack-refs.c
  57. builtin-prune-packed.c
  58. builtin-prune.c
  59. builtin-push.c
  60. builtin-read-tree.c
  61. builtin-reflog.c
  62. builtin-rerere.c
  63. builtin-rev-list.c
  64. builtin-rev-parse.c
  65. builtin-revert.c
  66. builtin-rm.c
  67. builtin-runstatus.c
  68. builtin-shortlog.c
  69. builtin-show-branch.c
  70. builtin-show-ref.c
  71. builtin-stripspace.c
  72. builtin-symbolic-ref.c
  73. builtin-tar-tree.c
  74. builtin-unpack-objects.c
  75. builtin-update-index.c
  76. builtin-update-ref.c
  77. builtin-upload-archive.c
  78. builtin-verify-pack.c
  79. builtin-write-tree.c
  80. builtin.h
  81. cache-tree.c
  82. cache-tree.h
  83. cache.h
  84. check-builtins.sh
  85. check-racy.c
  86. color.c
  87. color.h
  88. combine-diff.c
  89. commit.c
  90. commit.h
  91. config.c
  92. config.mak.in
  93. configure.ac
  94. connect.c
  95. convert-objects.c
  96. convert.c
  97. copy.c
  98. COPYING
  99. csum-file.c
  100. csum-file.h
  101. ctype.c
  102. daemon.c
  103. date.c
  104. delta.h
  105. diff-delta.c
  106. diff-lib.c
  107. diff.c
  108. diff.h
  109. diffcore-break.c
  110. diffcore-delta.c
  111. diffcore-order.c
  112. diffcore-pickaxe.c
  113. diffcore-rename.c
  114. diffcore.h
  115. dir.c
  116. dir.h
  117. dump-cache-tree.c
  118. entry.c
  119. environment.c
  120. exec_cmd.c
  121. exec_cmd.h
  122. fast-import.c
  123. fetch-pack.c
  124. fetch.c
  125. fetch.h
  126. generate-cmdlist.sh
  127. git-add--interactive.perl
  128. git-am.sh
  129. git-applymbox.sh
  130. git-applypatch.sh
  131. git-archimport.perl
  132. git-bisect.sh
  133. git-checkout.sh
  134. git-clean.sh
  135. git-clone.sh
  136. git-commit.sh
  137. git-compat-util.h
  138. git-cvsexportcommit.perl
  139. git-cvsimport.perl
  140. git-cvsserver.perl
  141. git-fetch.sh
  142. git-gc.sh
  143. git-instaweb.sh
  144. git-lost-found.sh
  145. git-ls-remote.sh
  146. git-merge-octopus.sh
  147. git-merge-one-file.sh
  148. git-merge-ours.sh
  149. git-merge-resolve.sh
  150. git-merge-stupid.sh
  151. git-merge.sh
  152. git-p4import.py
  153. git-parse-remote.sh
  154. git-pull.sh
  155. git-quiltimport.sh
  156. git-rebase.sh
  157. git-relink.perl
  158. git-remote.perl
  159. git-repack.sh
  160. git-request-pull.sh
  161. git-reset.sh
  162. git-send-email.perl
  163. git-sh-setup.sh
  164. git-svn.perl
  165. git-svnimport.perl
  166. git-tag.sh
  167. git-verify-tag.sh
  168. GIT-VERSION-GEN
  169. git.c
  170. git.spec.in
  171. gitk
  172. grep.c
  173. grep.h
  174. hash-object.c
  175. help.c
  176. http-fetch.c
  177. http-push.c
  178. http.c
  179. http.h
  180. ident.c
  181. imap-send.c
  182. index-pack.c
  183. INSTALL
  184. interpolate.c
  185. interpolate.h
  186. list-objects.c
  187. list-objects.h
  188. local-fetch.c
  189. lockfile.c
  190. log-tree.c
  191. log-tree.h
  192. Makefile
  193. merge-file.c
  194. merge-index.c
  195. merge-recursive.c
  196. merge-tree.c
  197. mktag.c
  198. mktree.c
  199. object-refs.c
  200. object.c
  201. object.h
  202. pack-check.c
  203. pack-redundant.c
  204. pack.h
  205. pager.c
  206. patch-delta.c
  207. patch-id.c
  208. path-list.c
  209. path-list.h
  210. path.c
  211. peek-remote.c
  212. pkt-line.c
  213. pkt-line.h
  214. quote.c
  215. quote.h
  216. reachable.c
  217. reachable.h
  218. read-cache.c
  219. README
  220. receive-pack.c
  221. reflog-walk.c
  222. reflog-walk.h
  223. refs.c
  224. refs.h
  225. revision.c
  226. revision.h
  227. rsh.c
  228. rsh.h
  229. run-command.c
  230. run-command.h
  231. send-pack.c
  232. server-info.c
  233. setup.c
  234. sha1_file.c
  235. sha1_name.c
  236. shallow.c
  237. shell.c
  238. show-index.c
  239. sideband.c
  240. sideband.h
  241. ssh-fetch.c
  242. ssh-pull.c
  243. ssh-push.c
  244. ssh-upload.c
  245. strbuf.c
  246. strbuf.h
  247. tag.c
  248. tag.h
  249. tar.h
  250. test-chmtime.c
  251. test-date.c
  252. test-delta.c
  253. test-sha1.c
  254. test-sha1.sh
  255. trace.c
  256. tree-diff.c
  257. tree-walk.c
  258. tree-walk.h
  259. tree.c
  260. tree.h
  261. unpack-file.c
  262. unpack-trees.c
  263. unpack-trees.h
  264. update-server-info.c
  265. upload-pack.c
  266. usage.c
  267. utf8.c
  268. utf8.h
  269. var.c
  270. write_or_die.c
  271. wt-status.c
  272. wt-status.h
  273. xdiff-interface.c
  274. xdiff-interface.h