LinuxQuestions.org

LinuxQuestions.org (/questions/)
-   Linux - Software (http://www.linuxquestions.org/questions/linux-software-2/)
-   -   Running "svn update" but modified, uncommited file remains (http://www.linuxquestions.org/questions/linux-software-2/running-svn-update-but-modified-uncommited-file-remains-627492/)

kenneho 03-12-2008 07:39 AM

Running "svn update" but modified, uncommited file remains
 
Hi.


I made changes to a file, ran "svn update <filename>" to backtrace to the commited version, but nothing happened. "svn status" indicates that the file has been changed (it is marked with an "M").

How come svm does not overwrite my modified, uncommited file?

Nathanael 03-12-2008 07:58 AM

i will rtfm you :-P
http://svnbook.red-bean.com/en/1.4/svn-book.html

look up svn update and svn revert
also you could have done it a lot easier if you dont understand what svn did with svn help:
Code:

usage: svn <subcommand> [options] [args]
Subversion command-line client, version 1.4.4.
Type 'svn help <subcommand>' for help on a specific subcommand.
Type 'svn --version' to see the program version and RA modules
  or 'svn --version --quiet' to see just the version number.

Most subcommands take file and/or directory arguments, recursing
on the directories.  If no arguments are supplied to such a
command, it recurses on the current directory (inclusive) by default.

Available subcommands:
  add
  blame (praise, annotate, ann)
  cat
  checkout (co)
  cleanup
  commit (ci)
  copy (cp)
  delete (del, remove, rm)
  diff (di)
  export
  help (?, h)
  import
  info
  list (ls)
  lock
  log
  merge
  mkdir
  move (mv, rename, ren)
  propdel (pdel, pd)
  propedit (pedit, pe)
  propget (pget, pg)
  proplist (plist, pl)
  propset (pset, ps)
  resolved
  revert
  status (stat, st)
  switch (sw)
  unlock
  update (up)

Subversion is a tool for version control.
For additional information, see http://subversion.tigris.org/

Code:

# svn help revert
revert: Restore pristine working copy file (undo most local edits).
usage: revert PATH...

  Note:  this subcommand does not require network access, and resolves
  any conflicted states.  However, it does not restore removed directories.

Valid options:
  --targets arg            : pass contents of file ARG as additional args
  -R [--recursive]        : descend recursively
  -q [--quiet]            : print as little as possible
  --config-dir arg        : read user configuration files from directory ARG

Code:

# svn help update
update (up): Bring changes from the repository into the working copy.
usage: update [PATH...]

  If no revision given, bring working copy up-to-date with HEAD rev.
  Else synchronize working copy to revision given by -r.

  For each updated item a line will start with a character reporting the
  action taken.  These characters have the following meaning:

    A  Added
    D  Deleted
    U  Updated
    C  Conflict
    G  Merged

  A character in the first column signifies an update to the actual file,
  while updates to the file's properties are shown in the second column.
  A 'B' in the third column signifies that the lock for the file has
  been broken or stolen.

Valid options:
  -r [--revision] arg      : ARG (some commands also take ARG1:ARG2 range)
                            A revision argument can be one of:
                                NUMBER      revision number
                                '{' DATE '}' revision at start of the date
                                'HEAD'      latest in repository
                                'BASE'      base rev of item's working copy
                                'COMMITTED'  last commit at or before BASE
                                'PREV'      revision just before COMMITTED
  -N [--non-recursive]    : operate on single directory only
  -q [--quiet]            : print as little as possible
  --diff3-cmd arg          : use ARG as merge command
  --username arg          : specify a username ARG
  --password arg          : specify a password ARG
  --no-auth-cache          : do not cache authentication tokens
  --non-interactive        : do no interactive prompting
  --config-dir arg        : read user configuration files from directory ARG
  --ignore-externals      : ignore externals definitions


anupamsr 03-12-2008 09:16 AM

You could "checkout", or delete manually!


All times are GMT -5. The time now is 03:08 PM.